am 59308086: am 2b83b0f0: Merge "Don\'t update call log in CallerInfoQueryThread without permission" into mnc-dev

* commit '5930808671bd0acfbaffd4773cc275f72204aa94':
  Don't update call log in CallerInfoQueryThread without permission
tree: 50563775129ff9d1abf501f6df87487b0185c944
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags