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

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