diff options
| author | 2022-09-19 23:55:35 +0000 | |
|---|---|---|
| committer | 2022-09-19 23:55:35 +0000 | |
| commit | d4f95001c7a095225684184a4a0e739a2abde600 (patch) | |
| tree | 1779ec94fea641393cc4472cdc5ce4b7af96fde0 /libs/androidfw/ResourceTimer.cpp | |
| parent | b5a0ee46d38fa88db6cc311f3758a03c9aca552d (diff) | |
| parent | ae5b80ab72c7c633c9ffec606bbb077fbe8823de (diff) | |
[automerger skipped] Merge "[pm] forbid deletion of protected packages" into qt-dev am: b625b562c4 am: ae7a1df57d -s ours am: 478c97e58c -s ours am: 526af0d1b1 -s ours am: 151d75d3e8 -s ours am: d05066f4f7 -s ours am: 01a79b5ded -s ours am: 0d99f58638 -s ours am: 3f6eaacb35 -s ours am: ae5b80ab72 -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 fcdc62081c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19935572
Change-Id: Ie5468756000521668927cb76b9ca70621ab40f8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions