summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/AppOpsManager.java
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@cyngn.com>2016-07-07 14:19:06 -0700
committerJessica Wagantall <jwagantall@cyngn.com>2016-07-07 14:19:21 -0700
commitb6bddad1b6a0dc4f26651a1c44d8bfb57bd33fb2 (patch)
tree03bd38e3137ec8d21381bca069eda726a4f6c44b /core/java/android/app/AppOpsManager.java
parent2ab71c1e6f60b0ab76208a1fd5963bac12f4aee8 (diff)
parent9b8c6d2df35455ce9e67907edded1e4a2ecb9e28 (diff)
downloadframeworks_base-b6bddad1b6a0dc4f26651a1c44d8bfb57bd33fb2.zip
frameworks_base-b6bddad1b6a0dc4f26651a1c44d8bfb57bd33fb2.tar.gz
frameworks_base-b6bddad1b6a0dc4f26651a1c44d8bfb57bd33fb2.tar.bz2
Merge remote-tracking branch 'remotes/android-6.0.1_r52' into HEAD
Ticket: CYNGNOS-3020 Change-Id: Ia14b6d0120de0b458c7c249a11041ff121389cfa
Diffstat (limited to 'core/java/android/app/AppOpsManager.java')
0 files changed, 0 insertions, 0 deletions