summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Nan Wu <wnan@google.com> 2023-11-20 21:58:09 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-20 21:58:09 +0000
commit811913a928c3bd49028cfcff8c720b05da2a61d2 (patch)
tree55d509318dc31a475c013135d772fb4f09ad758f /libs/androidfw/FileStream.cpp
parent5ff719c566dfcf0637889e08140c580a6329fc40 (diff)
parentfc496ffbe42934192b276af6a43542bd6086ff30 (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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25329531 Change-Id: Ib61655a18e887b1dcb6fa2428fdb465616686e49 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