summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Peter Li <lpeter@google.com> 2024-08-29 07:36:18 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-08-29 07:36:18 +0000
commit532ba616767e561044f027d5eb2c3aa41a8a09e3 (patch)
tree1caebbf20ea6686545bf87389150c87eda5e77f0 /libs/androidfw/StringPool.cpp
parentf414a3dd12d37875b8ee046c40da18abf3253745 (diff)
parent6c222798b73b81275abdfd9868e80c0391195562 (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 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: I1486a384cf0cb653316e737cc4de5daf36cd5908 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