diff options
| author | 2022-08-24 18:53:01 +0000 | |
|---|---|---|
| committer | 2022-08-24 18:53:01 +0000 | |
| commit | 91d7b8e7fba7c3a50e07ceaf49e2cc93660e2126 (patch) | |
| tree | 7c8cb4e053a451e3f9298f3aa55b97f2acb3bfc1 /libs/androidfw/StringPool.cpp | |
| parent | b8096aa820d15ed422c76379308d4f8c41af8485 (diff) | |
| parent | 839d5ae90cbe028479db6ef7b29ac6e29d8ac8e9 (diff) | |
[automerger skipped] Merge "Prevent non-admin users from deleting system apps." into rvc-dev am: 71fad59e5e am: 476be4be3c am: 916d292b28 am: fee26edc80 am: 044600c74e -s ours am: 3392b69c87 -s ours am: 181db6aa71 -s ours am: 1bd04d17eb -s ours am: 839d5ae90c -s ours
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19570390
Change-Id: I184277cfb202dadbedf6a833abcfda8fc4aece9d
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