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