summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Peter Li <lpeter@google.com> 2024-08-29 07:45:09 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-08-29 07:45:09 +0000
commit90679a3255fa5d3a00a4a2e4e93ec7b3a6840919 (patch)
tree116c6f3f02a0ef794dcf715ac2392838922e1f40 /libs/androidfw/StringPool.cpp
parent1d60890b932e6110d9400b59b3430e8a9a0b446f (diff)
parent71d47523345578480c6212e313244935205664d3 (diff)
[automerger skipped] Merge "Disallow device admin package and protected packages to be reinstalled as instant." into sc-dev am: b5d26f69c8 am: 1c656694a9 am: 54749a90ea -s ours am: 55496f95cd -s ours am: 575aa2719c -s ours am: aa494d6e08 -s ours am: 71d4752334 -s ours
am skip reason: Merged-In Ib1ed417072a3e942284e267e660631bd9e863248 with SHA-1 691d163e52 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28640384 Change-Id: If9fd02aaa4517804e9f57ac7ba82eeba38419708 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