tree 2cfdc2f2ec58f472612fc75f77455a4a670b9b71
parent 2fc9c1242266f02ee73e245f5ca8134781223bf6
parent 336f18ba2873935c892b693509d5ae7c7696aeb9
author Amit Mahajan <amitmahajan@google.com> 1436898566 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436898566 +0000

am 336f18ba: am 51b4e97a: Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev

* commit '336f18ba2873935c892b693509d5ae7c7696aeb9':
  Add checks for READ_PRIVILEGED_PHONE_STATE.