summaryrefslogtreecommitdiff
path: root/tools/aapt2/LoadedApk.cpp
diff options
context:
space:
mode:
author Ganesh Olekar <olekarg@google.com> 2022-08-15 11:53:01 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-15 11:53:01 +0000
commit9dbb9085143713caeb502f02d79ec83132b54bdf (patch)
tree8aff2b709297967ca39b82b8ef11c7e8fb61e627 /tools/aapt2/LoadedApk.cpp
parent22683c5be2b9fba08366eff84e742b700aeb68c1 (diff)
parent5b41713cbcd8e67bf4f24647e8cf3d8403d0789d (diff)
[automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into qt-dev am: e893eff6f2 am: dc45b9fed3 -s ours am: 0f8fc1a47e -s ours am: e0cb2beeae -s ours am: 191abef1fa -s ours am: 1dd4d7a13b -s ours am: 727120aa1f -s ours am: 5b41713cbc -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18327410 Change-Id: Ie73da1bbd66e1de565fa53483e09ff9629d77e17 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt2/LoadedApk.cpp')
0 files changed, 0 insertions, 0 deletions