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

* commit '75e0d2a8b0e0e4115263df91bf3126e4e8a76bfa':
tree: 84230245b6d0620425180d5fab12ff558de999ab
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags