tree faff7bf5408d9e495ac9a6ee4c0266939480c6bc
parent 4196d0c95816617148defc0c00f8caba45854ccf
parent 5dcaddb5166e5473925a374bd169aa025df0da10
author Paul Miller <paulmiller@google.com> 1446066497 +0000
committer android-build-merger <android-build-merger@google.com> 1446066497 +0000

Merge "Manual cherry-pick of "Update permission usage for M"" am: 4e9bcb71eb
am: 5dcaddb516

* commit '5dcaddb5166e5473925a374bd169aa025df0da10':
  Manual cherry-pick of "Update permission usage for M"