summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Christophe Pinelli <cpinelli@google.com> 2023-11-21 22:58:45 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-21 22:58:45 +0000
commitc295448ebb2f1d6b32ff63edb30f0e2df2e14012 (patch)
tree97bcc97a4a3ae9ea450a6f22cc8e9f2fd6dc8595 /libs/androidfw/FileStream.cpp
parent082ab3fc5b76f7df7108fc984fe371061e678943 (diff)
parentf470bb0bf36f68d6fb07639f5dd00e28224457f9 (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: ae515c253c -s ours am: 3b75f4965f -s ours am: f470bb0bf3 -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: Id6713e7445700a995f65deedaf0cac88fe568fbf 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