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

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