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
commit3689ffe69e534e91db848c3fe1a12eb5efb65ee0 (patch)
tree30a9653798f61eaa4e25f8c968b1faf81d6f7903 /libs/androidfw/StringPool.cpp
parentb5b7fe48eb7a119c655c97155dc4757259414d41 (diff)
parent532ba616767e561044f027d5eb2c3aa41a8a09e3 (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 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: I9f9eee7960d46fcd58b16d04bfc3a7417db84141 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