summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Nan Wu <wnan@google.com> 2023-11-07 18:59:49 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-07 18:59:49 +0000
commit37de9679d6026d00dca42f1217f76cbf88125c2a (patch)
treeb93b7b900a589214e5776bc8ce41f7cf0dc429d6 /libs/androidfw/FileStream.cpp
parent5fb4dc3a71c354fdb6c78ebc07b1ecb3d4efd8b8 (diff)
parenta7567905958f07073608123087953b233b45d7ba (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: 48c28e2f36 -s ours am: fd6ab80bd1 -s ours am: a756790595 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24077613 Change-Id: I5733b459c72d81ce4cc87728d5ddc1fb128c6be4 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