summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
author Peter Li <lpeter@google.com> 2024-08-29 07:08:46 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-08-29 07:08:46 +0000
commit55496f95cd38ac1f2d4ffe38f14c138f67a0bbdb (patch)
tree0d1ec701319a05aee44faa3faa967abbca2e28d1 /libs/androidfw/AssetManager.cpp
parent9454d5b14a66c0c5e601c01a5f8af3dcb7438ab4 (diff)
parent54749a90ea8c9caaef6a066ac3bf264ca86c7c5a (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 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: Ica99e3d783b979a710837a7a3795dfe944b98a89 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions