summaryrefslogtreecommitdiff
path: root/libs/permission/AppOpsManager.cpp
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2023-03-14 23:06:20 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-14 23:06:20 +0000
commit8581024b0860b4cd54c767c03957701047f26eb3 (patch)
treeb8914f7833e6a712de13cda63ff2f47c0de3b48a /libs/permission/AppOpsManager.cpp
parent878e3bddfb989274564ccce66296de8dbf454745 (diff)
parent052584b1b539a1c329f2a01dfa5f9474f93b28c1 (diff)
[automerger skipped] Merge Android 13 QPR2 am: f9a794c359 -s ours am: 052584b1b5 -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: Ie8eefbd2db5f90a3010c9cd20b0827892ea0e2cb 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