am 9cd610f3: (-s ours) am 2b83b0f0: Merge "Don\'t update call log in CallerInfoQueryThread without permission" into mnc-dev

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