summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Peter Li <lpeter@google.com> 2024-08-29 07:55:11 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-08-29 07:55:11 +0000
commit3dd34827b7128b4aefa83839bc041d0e548f91a6 (patch)
treea08a80eb2192cf3373d1834e08ebdafb5b9d788a /libs/androidfw/StringPool.cpp
parentf7920c1edbdcc2de9a62ade84363e5eb8ad4fa12 (diff)
parent3689ffe69e534e91db848c3fe1a12eb5efb65ee0 (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: 532ba61676 -s ours am: 3689ffe69e -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: I727d7f43aa7509bbfbe0a8f41b22b42906550c94 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