tree 0317e3e9a44b3e0a0961b401ccd91473d2bc6188
parent 5086a970e786ac4629f5f275a5df25f6e24e1f61
parent 51b4e97ae42fb789b7d1c9d4134ddaa7e2b27b11
author Amit Mahajan <amitmahajan@google.com> 1436897579 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436897579 +0000

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

* commit '51b4e97ae42fb789b7d1c9d4134ddaa7e2b27b11':
  Add checks for READ_PRIVILEGED_PHONE_STATE.