summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Peter Li <lpeter@google.com> 2024-08-29 07:45:57 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-08-29 07:45:57 +0000
commitc2fd6e533764ee1305f2a7c44e055b79f69b6b0c (patch)
tree0a888ef71df31e38944787d00841a01a9fe20b06 /libs/androidfw/StringPool.cpp
parentde364159dc3d136287420d000bbecaf2c977edb1 (diff)
parent1d60890b932e6110d9400b59b3430e8a9a0b446f (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: e9468b5614 -s ours am: 6c222798b7 -s ours am: 1d60890b93 -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: Ifdf12c064206c4682aaee61b928c8ee41b24374e 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