tree b23c250be513419bcb4a1218f21463e3eacc93d1
parent 56b543a14c45394387b284667b77da95501eb2ad
parent 01af870bc229bb6fc1494d1fb0e8779360e7a956
author Amit Mahajan <amitmahajan@google.com> 1440713067 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440713067 +0000

am 01af870b: am 2ef2d46f: (-s ours) am 0ff3d838: Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev

* commit '01af870bc229bb6fc1494d1fb0e8779360e7a956':