tree 4735465191e23e4a4fe7e7c7035dac63f6e07876
parent 8df9e5b867447a604d914556756e43d3af31804c
parent def9d651e3d988bdb282896f9e4f4e052b91e701
author Sanket Padawe <sanketpadawe@google.com> 1431558830 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431558830 +0000

am def9d651: am 173ef9f6: am 6319a35f: am 7f967eeb: Merge "Remove CTS tests which require MODIFY_PHONE_STATE permission." into lollipop-mr1-cts-dev

* commit 'def9d651e3d988bdb282896f9e4f4e052b91e701':
  Remove CTS tests which require MODIFY_PHONE_STATE permission.