summaryrefslogtreecommitdiff
path: root/libs/permission/AppOpsManager.cpp
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2023-03-15 00:08:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-15 00:08:52 +0000
commit3400eb62bf22e220ff16ea18c862baf7b191216d (patch)
treeddd71da83885d3b51271c81f404687f75dd51430 /libs/permission/AppOpsManager.cpp
parentf1262c9b75a51aaef912fe6542eee7a148e57290 (diff)
parent00fe7c3f7638253aa56c14cd296a42f9270fbc18 (diff)
[automerger skipped] Merge "Merge Android 13 QPR2" am: ac37afeff9 -s ours am: 9862508700 -s ours am: 00fe7c3f76 -s ours
am skip reason: Merged-In Ic7e102201196285cba18e12e27c7cd4d40dcc8e4 with SHA-1 95f9197944 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2485658 Change-Id: I9dd313097b2ad4c8fb722156b527f0b53d0b5216 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/permission/AppOpsManager.cpp')
0 files changed, 0 insertions, 0 deletions