diff options
| author | 2023-03-31 16:58:55 +0000 | |
|---|---|---|
| committer | 2023-03-31 16:58:55 +0000 | |
| commit | 7bc82e9e2b3e0e2a1dc4842546e272828a0bd9ae (patch) | |
| tree | e43a2808e6af2e72421acc0683ab8f839e96a152 /libs/androidfw/ApkParsing.cpp | |
| parent | 2d6da22404bc7facca5d85c1a59041853ccedb4a (diff) | |
| parent | 933ad6e1c8336c6ad630a67d818c5a21ef6ffe7d (diff) | |
[automerger skipped] Merge "Enforce DevicePolicyManager.setUserControlDisabledPackages in AppStandbyController" into rvc-dev am: b4083e039e am: 0e7ecf6fbe -s ours am: a95419098d -s ours am: e6871844eb -s ours am: 769a0d367a -s ours am: 933ad6e1c8 -s ours
am skip reason: Merged-In I4279dc37f0e17aedb1c2a87468478248443a253e with SHA-1 3dbab873d6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22301867
Change-Id: Iccfb40480187a38d4bcc17061ca0839d1ac1a833
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