tree a5dfa9d1f9fd23340911dd5dd9a26067ef5f6915
parent bd7d5342fdf4a3d2bcd880d111cb6a23395541ab
parent b5538bb2ddff6eb4f5d47660f39da4163f6613f1
author Amit Mahajan <amitmahajan@google.com> 1440677917 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440677917 +0000

am b5538bb2: (-s ours) am 43d23ef3: Merge "Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm." into mnc-dev

* commit 'b5538bb2ddff6eb4f5d47660f39da4163f6613f1':