Merge "Don't cancel incall notification unnecessarily" into lmp-mr1-dev
tree: 1bb4dde5877095745cd170a21f0edd4d5d7404e6
  1. res/
  2. src/
  3. proguard.flags