am 8e95e753: (-s ours) am b8bc2a76: Switch to proxy variants of app-ops calls.
authorJeff Sharkey <jsharkey@android.com>
Thu, 27 Aug 2015 12:18:02 +0000 (12:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 12:18:02 +0000 (12:18 +0000)
commitd3d89377d14907de97927e4427bb1b6c5d7c3bec
treeb5e807a9ee3e94273fad06df91a3a6633552b63c
parent1cd71b54b65646f1eb8bff99d5bb13e156fc4af3
parent8e95e753f96aa5ff526834ad74419360a48e1dc4
am 8e95e753: (-s ours) am b8bc2a76: Switch to proxy variants of app-ops calls.

* commit '8e95e753f96aa5ff526834ad74419360a48e1dc4':