summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Oli Lan <olilan@google.com> 2022-08-24 17:00:38 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-24 17:00:38 +0000
commit620cc32ffe3a4fc0b6f2a8c4b2f72372f61082e7 (patch)
treee680dee6eccac73738f9c7d8b325f74fc6f62732 /libs/androidfw/StringPool.cpp
parent330adeadc4c40d56d54d5d5fc53067efa2238f77 (diff)
parentefd6628052c0d350c5bd2aa7f2b7824dcc6153f4 (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: adafc9cb0f am: 02101eec31 -s ours am: 35868459ce -s ours am: 4bbf0d99f4 -s ours am: df9c2c7df0 -s ours am: efd6628052 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19532979 Change-Id: I4655ed2231aec36cf25f62b40cb45a98666b9196 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions