diff options
| author | 2022-08-24 19:14:18 +0000 | |
|---|---|---|
| committer | 2022-08-24 19:14:18 +0000 | |
| commit | 78dadb236297a3a24966f6b9f3a863d15b551243 (patch) | |
| tree | 7c8cb4e053a451e3f9298f3aa55b97f2acb3bfc1 /libs/androidfw/StringPool.cpp | |
| parent | 76544ef2f47128b7514b2ca9d04af4aafcd692f1 (diff) | |
| parent | 9538034f39243722a96065a50d35aa37446b4759 (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: 514eaefa2c -s ours am: d1a5e1f023 -s ours am: afab4a1597 -s ours am: 9538034f39 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19532979
Change-Id: Ie04c89ce68a6fb92a415f31fb46b8a446efb6076
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