summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
author Peter Li <lpeter@google.com> 2024-08-29 07:26:38 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-08-29 07:26:38 +0000
commitaa494d6e08e6049c39aa65a24be3a12de35452f2 (patch)
treefa106948cc208f0503975eaee51dc692c49848e5 /libs/androidfw/AssetManager.cpp
parenta9ec1af49d5b55a6bcb6930e8a4f6691c0c322bf (diff)
parent575aa2719ceb643f8204ce6b6a8f204c29f8b9b4 (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: 575aa2719c -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: I0a8727f674f328f611bac680cd514d3f347506d8 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