summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Nan Wu <wnan@google.com> 2023-11-07 19:40:54 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-07 19:40:54 +0000
commitb140ebf19c9464cb25ec9564e67acdebab65c5cc (patch)
treede5c5542eb746901e90fdf27bdf0538687c4634d /libs/androidfw/FileStream.cpp
parent36a399bcb9f0628483b3ee86e3df64478499fe51 (diff)
parent3ff29a219e743c7658321e0c6fbdb74d4a1c5f44 (diff)
[automerger skipped] Merge "DO NOT MERGE Disallow Wallpaper service to launch activity from background." into tm-dev am: caf5747b97 am: 7278e885d8 -s ours am: 3eba72a803 -s ours am: 36ec213f2c -s ours am: 3ff29a219e -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23912846 Change-Id: If22962b2d357531eb753a673db8b51720a68e7ee 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