am 610ead01: (-s ours) am 3cf92c74: Merge "Update Dialer permissions UI per mocks" into mnc-dev

* commit '610ead01e7c400f146d5256f51c685c274a0c512':
tree: 8924d31ff2ecb8b544ab35dab62f515aac397156
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags