summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Christophe Pinelli <cpinelli@google.com> 2023-11-21 23:34:37 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-21 23:34:37 +0000
commit1a570d99575459dd70bdef731906f2a4e2546e98 (patch)
treeea8330bb63d1d38dbc28de2793f8858d76d74e40 /libs/androidfw/FileStream.cpp
parent6ecf51640d0025714aac923b1ac560e4fd3a3d67 (diff)
parent910d4f5a5c08f2b83a883617abec352a32d5d248 (diff)
[automerger skipped] Merge "Restrict activity launch when caller is running in the background" into rvc-dev am: dce6a262f7 am: f3e0e019b6 -s ours am: 44cf76a444 -s ours am: a43fce1d35 -s ours am: e8d5e56e47 -s ours am: 192afbf336 -s ours am: a338885858 -s ours am: e4cafeb8e5 -s ours am: 910d4f5a5c -s ours
am skip reason: Merged-In I1a0c13e74622d301866efaca1b5351a6b241ebe5 with SHA-1 d54a64bdf7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23262449 Change-Id: Id53d76f0dd3351f181a114ac38f2039be3531474 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