summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Pavel Grafov <pgrafov@google.com> 2023-03-31 14:51:33 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-31 14:51:33 +0000
commit11fe435599579ae1ee018b492d4c8cdf466e7d23 (patch)
tree43712d435efb1504559b7158e0b428b7419ada3f /libs/androidfw/FileStream.cpp
parent29c8bcf0e5fe9cdbf436535dfbd87d2ece4a038a (diff)
parentb00fb4ab6f8eccf82cd8100fc512197a472922ef (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: b00fb4ab6f -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: I750d0d694a3ebf6e357ccdf879b44e0ea72759ee 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