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