summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Oli Lan <olilan@google.com> 2022-08-24 18:22:40 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-24 18:22:40 +0000
commitd5d14f19873aff5ced3facd9758b303d24bd8412 (patch)
treebb5c84f28e32148c1679ff4cd7f2c50d34d56f11 /libs/androidfw/StringPool.cpp
parent10d854796fb57f6fd7a05968d322760a1dba9136 (diff)
parent5d873e955a26f3bd8ca56caef41b554e42c9cc79 (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: 5d873e955a -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19532979 Change-Id: I94e64d27388b1a5d117b0f82b4b376e13618cc8b 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