summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Oli Lan <olilan@google.com> 2022-08-24 17:48:39 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-24 17:48:39 +0000
commita80c234b3aea1914f1903284ca8764ea4fa02b37 (patch)
tree09705c42b6b0b9bd8dd46e5c62b12d0c2e4282f4 /libs/androidfw/StringPool.cpp
parentac3d035a8c84ad94b03621534065545271c6ca9d (diff)
parent421657eb1061bb3934d3426ebb58f5ebcb16048d (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: 421657eb10 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19532979 Change-Id: Idb72d65ad2a6923e21f27bf585abb25e1325ff1e 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