summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Nan Wu <wnan@google.com> 2023-11-20 22:36:07 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-20 22:36:07 +0000
commit7407517df1240fd931c95e682b4247127530a2a3 (patch)
tree0beecdf174e00a76057b20314e133b7cba2092ab /libs/androidfw/FileStream.cpp
parent84ec497c7856cabb2e531b79141ef97158e9b21d (diff)
parent811913a928c3bd49028cfcff8c720b05da2a61d2 (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: 811913a928 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25329531 Change-Id: Ia9bdc266b3f282c7a4b1ae4e7552668c3d711f36 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