tree 84230245b6d0620425180d5fab12ff558de999ab
parent 5952c82d5d3081a7033f1b7e6d1cb09880e5ac22
parent 75e0d2a8b0e0e4115263df91bf3126e4e8a76bfa
author Yorke Lee <yorkelee@google.com> 1440685128 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440685128 +0000

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

* commit '75e0d2a8b0e0e4115263df91bf3126e4e8a76bfa':