summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Nan Wu <wnan@google.com> 2023-11-07 19:01:38 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-07 19:01:38 +0000
commit11283028404b9263104b4d2b97ba067e661faea2 (patch)
treeb93b7b900a589214e5776bc8ce41f7cf0dc429d6 /libs/androidfw/FileStream.cpp
parent8c371f77e9bf9e5f56a556230d1a847df05dfcda (diff)
parent122f693b91002a893a9f81932ac23f9b72483686 (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: 122f693b91 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24077613 Change-Id: I2705ed3d2e27f3ccff0b2e94d7307531b1456b79 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