tree b23c250be513419bcb4a1218f21463e3eacc93d1
parent 8029d292012759136deaf2896c0d4f4f363db558
parent 04acddb70a105cd770c82efb308d1da7a1462f9b
author Amit Mahajan <amitmahajan@google.com> 1440713068 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440713068 +0000

am 04acddb7: am 7881604a: (-s ours) am 7da7ea93: Fixed typo (READ_PHONE_STATE to READ_PRIVILEGED_PHONE_STATE)

* commit '04acddb70a105cd770c82efb308d1da7a1462f9b':