summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Pavel Grafov <pgrafov@google.com> 2023-03-31 14:54:08 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-31 14:54:08 +0000
commit22aca7d7b7932bb83179f91ac047b6a15ce81cd2 (patch)
tree525be8bcd30e78a62aa57435bfe3ff2b79cb5daf /libs/androidfw/ApkParsing.cpp
parent3724ca17593c9cc423501ea042910539b8fffce2 (diff)
parent3804c84c8017c1823dc83ccc9afc38b97c3c6a82 (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: 3804c84c80 -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: Icd496463b45ceff767f5b05dd3e1a0b05567ab0f 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