diff options
| author | 2023-03-31 14:23:57 +0000 | |
|---|---|---|
| committer | 2023-03-31 14:23:57 +0000 | |
| commit | b00fb4ab6f8eccf82cd8100fc512197a472922ef (patch) | |
| tree | 32c8eca04cf28a64a17f3676d0ec8a82b5253528 /libs/androidfw/FileStream.cpp | |
| parent | 93863fbae61fa6dde91a9e110cc11aa65ac51ca0 (diff) | |
| parent | b4e180f3079079dee692c7cb314627794bde50f5 (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: I78b5eb7e8e37f7ea993cc73af1615b0b4a27d129
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions