summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Nan Wu <wnan@google.com> 2023-11-07 18:24:54 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-07 18:24:54 +0000
commit7246c76598a7e0539a60ab766cc3c6d954231b0a (patch)
tree47f0b5fa014c04c41fe900b5a10d24d3f1fe656f /libs/androidfw/FileStream.cpp
parentb3ad94dc768715eb0d6b5be2defb0998eaad9f0f (diff)
parent20530ad7b04071ceab3604bdc962f1e6a8a4904d (diff)
[automerger skipped] Merge "DO NOT MERGE Disallow Wallpaper service to launch activity from background." into tm-dev am: caf5747b97 am: 0fdf65c7b0 am: 65ea565903 -s ours am: 20530ad7b0 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23912846 Change-Id: I52277243496c2a3fa14baf82bc706b32e10e5611 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