summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Songchun Fan <schfan@google.com> 2022-09-16 01:00:46 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-16 01:00:46 +0000
commit9eddbdf0ffbe337e4367f0270cf9946a2465bdbe (patch)
treeb2aa7b4bcbb9b2ce336fbe8a590b7369200fef76 /libs/androidfw/StringPool.cpp
parentfdc531f02897289593a0eb9908d291a3c6496e24 (diff)
parent380e4ee358a97ecf23323a8cde2e8efdd3620199 (diff)
[automerger skipped] Merge "[pm] forbid deletion of protected packages" into sc-dev am: b2abf2632c -s ours am: 74663b3683 -s ours am: 61e5224009 -s ours am: 7848fdd564 -s ours am: 380e4ee358 -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 2d6eae165b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19942600 Change-Id: I33faad0f8951aa1f74d4c93e382ef1ebad8bef92 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