tree 22a8c4fafef7f8b49e5f05a44b9a44ec88f01449
parent 01af870bc229bb6fc1494d1fb0e8779360e7a956
parent 7881604a22dc092af0ccf3ebbbefedb16a5cc390
author Amit Mahajan <amitmahajan@google.com> 1440678080 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440678080 +0000

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

* commit '7881604a22dc092af0ccf3ebbbefedb16a5cc390':