summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Pavel Grafov <pgrafov@google.com> 2023-03-31 14:24:59 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-31 14:24:59 +0000
commit3804c84c8017c1823dc83ccc9afc38b97c3c6a82 (patch)
tree9ccbf88562a3bb579f253aa3d487eeffc2a2e218 /libs/androidfw/ApkParsing.cpp
parent082f5a14177898415f66985af8ec2433d5edc327 (diff)
parentb4e180f3079079dee692c7cb314627794bde50f5 (diff)
[automerger skipped] Merge "Enforce DevicePolicyManager.setUserControlDisabledPackages in AppStandbyController" into sc-dev am: 84a6ab8a49 am: c126c64035 am: f9cbf9020c -s ours am: b4e180f307 -s ours
am skip reason: Merged-In I4279dc37f0e17aedb1c2a87468478248443a253e with SHA-1 99b199d113 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22311042 Change-Id: I08be99c45770d6dcb353a041219a0ab8585d36b4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions