summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Nan Wu <wnan@google.com> 2023-11-07 18:24:28 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-07 18:24:28 +0000
commit91c65bc384bae192e96cb915d5aff05026e47e16 (patch)
tree47f0b5fa014c04c41fe900b5a10d24d3f1fe656f /libs/androidfw/FileStream.cpp
parent1ef069c91c964cbd3af72d59db7b8407c9c21ae0 (diff)
parent2b763bd19e33cd1f28ff8ca051cfb854358de5c1 (diff)
[automerger skipped] Merge "DO NOT MERGE Disallow Wallpaper service to launch activity from background." into rvc-dev am: 9c2ddfc6c2 am: 2af67c0c80 -s ours am: c9892a6eb6 -s ours am: d280f3c1bd -s ours am: 1c7010d707 -s ours am: dc294be7b6 -s ours am: 4dc2c6760b -s ours am: 2cf905eeb3 -s ours am: 2b763bd19e -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24077613 Change-Id: Icb186ba515787ca8c381d6d38f990784d201251f 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