summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Christophe Pinelli <cpinelli@google.com> 2023-11-21 22:57:42 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-21 22:57:42 +0000
commit1f6e0e420a13a26e159ea2b47410e0a41c1ce561 (patch)
treeca3eb7695dd407cc47d8f1ed90a2f3addbbafe4f /libs/androidfw/FileStream.cpp
parent910d4f5a5c08f2b83a883617abec352a32d5d248 (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: I177841f95a795f2fab2cdbc71d3b546755debfdc 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