tree 0073a752a6605e4e4d2df33247c9b6fd7b13afd2
parent 5328566d07ef0b2730ca25c07dbc55b874906ce8
parent 7e03db7213214eaeeafed667b57ce61839f8fd75
author Yorke Lee <yorkelee@google.com> 1437159219 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437159219 +0000

am 7e03db72: am 91ecb136: Merge "Add permission prompts for contacts and dialpad search" into mnc-dev

* commit '7e03db7213214eaeeafed667b57ce61839f8fd75':
  Add permission prompts for contacts and dialpad search