tree 8fba70a59f021e5848e0d93376b137cb124ddacf
parent 2962df6990830b72f7139475d7238ecdb4dda851
parent 4e9bcb71eb88de0e4d91b126e31925725f7c483a
author Paul Miller <paulmiller@google.com> 1446066019 +0000
committer android-build-merger <android-build-merger@google.com> 1446066019 +0000

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

* commit '4e9bcb71eb88de0e4d91b126e31925725f7c483a':
  Manual cherry-pick of "Update permission usage for M"