summaryrefslogtreecommitdiff
path: root/libs/permission/AppOpsManager.cpp
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2023-03-14 23:08:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-14 23:08:50 +0000
commit00fe7c3f7638253aa56c14cd296a42f9270fbc18 (patch)
treeb8914f7833e6a712de13cda63ff2f47c0de3b48a /libs/permission/AppOpsManager.cpp
parent8581024b0860b4cd54c767c03957701047f26eb3 (diff)
parent9862508700c1270e26bd2c509ee625c4069395e6 (diff)
[automerger skipped] Merge "Merge Android 13 QPR2" am: ac37afeff9 -s ours am: 9862508700 -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: I0eb6adb420e1f82c800d4992ba6bd57535a27c51 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