tree 56217c46306b3dfeff9eda260218fcf053a2503d
parent 87cede6d13e3ed1f659a1cf0279ec4b9dca825db
parent 2b83b0f09ad01ec9651e86b21dc7a19ead6f7d74
author Yorke Lee <yorkelee@google.com> 1438131689 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438131689 +0000

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