summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Oli Lan <olilan@google.com> 2022-08-24 18:16:44 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-24 18:16:44 +0000
commit351025e8a33adcde0d54933944ca9eacb0ca4886 (patch)
tree09705c42b6b0b9bd8dd46e5c62b12d0c2e4282f4 /libs/androidfw/StringPool.cpp
parent931afc5f21d48069285b4b3dd556c8776180067e (diff)
parentede7acde4b585bba74a2fd790663ec4ab554bd9e (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: 620cc32ffe -s ours am: ede7acde4b -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19532979 Change-Id: I76c758553acc3c28f9b647940bbc3dc47797de98 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