summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Nan Wu <wnan@google.com> 2023-11-07 19:58:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-07 19:58:50 +0000
commitd983171a956c902a951f4152630c577d30e7bc37 (patch)
tree043ff3c241ae184678a36bcc8133f805d9fed8fb /libs/androidfw/FileStream.cpp
parent85601366c3885e0797103d6a636c8fd66c73317c (diff)
parent0d4bcfa8d5be5b315ed08fcef45be64b087e3102 (diff)
[automerger skipped] Merge "DO NOT MERGE Disallow Wallpaper service to launch activity from background." into tm-dev am: caf5747b97 am: 0fdf65c7b0 am: 65ea565903 -s ours am: 20530ad7b0 -s ours am: 72619a2946 -s ours am: 4d26fc4a0c -s ours am: 0d4bcfa8d5 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23912846 Change-Id: Iab10a10ae510607a35adcea376c31acd3980deb9 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