summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Nan Wu <wnan@google.com> 2023-11-21 00:29:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-21 00:29:13 +0000
commita2637dcfd9aebfb46452303061c620ff4f6378b3 (patch)
treead965d6ea05dad0969b98c4018f9f06933f1f463 /libs/androidfw/FileStream.cpp
parent1b2df6ba828767fd67259e64b77166493562037e (diff)
parent2308a755331ed712ec8d0c330b6e1f176ea46528 (diff)
[automerger skipped] Merge "DO NOT MERGE Disallow Wallpaper service to launch activity from background." into sc-v2-dev am: 2bb5270437 -s ours am: fc496ffbe4 -s ours am: 3c8b4759cc -s ours am: 4e81397655 -s ours am: 41f0b2f410 -s ours am: 740fee5cf6 -s ours am: 2308a75533 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25329531 Change-Id: I5be17881252649fb07521304eb7a8be2f47157c7 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