diff options
| author | 2022-08-24 18:26:14 +0000 | |
|---|---|---|
| committer | 2022-08-24 18:26:14 +0000 | |
| commit | 7eae1bbf8f765b92301dde75a84b630f7855cfbc (patch) | |
| tree | bb5c84f28e32148c1679ff4cd7f2c50d34d56f11 /libs/androidfw/StringPool.cpp | |
| parent | 3fd6a4f3a8dfcef08cab38e93d7db2fe3af104c7 (diff) | |
| parent | 351025e8a33adcde0d54933944ca9eacb0ca4886 (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: 351025e8a3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19532979
Change-Id: I4e87b79dfe8c0bf2652f86c37d6a8814a0aaea68
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