summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Christophe Pinelli <cpinelli@google.com> 2023-11-21 16:56:55 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-21 16:56:55 +0000
commitcebc7a5b3769cdbaca1c29af997aed2d98c3a3a1 (patch)
treeca3eb7695dd407cc47d8f1ed90a2f3addbbafe4f /libs/androidfw/FileStream.cpp
parent9cc34f412bc7baa0d1eca83714d2bdaf65e91cb0 (diff)
parent13aeabe2fb94ad20d03e56634c89ba22f1b4fddd (diff)
[automerger skipped] Merge "Restrict activity launch when caller is running in the background" into sc-dev am: d75dd811c5 am: 59dc1375f4 am: 9cd28ccd7c -s ours am: d3f5b99607 -s ours am: 459ece6797 -s ours am: 798af2cf48 -s ours am: 13aeabe2fb -s ours
am skip reason: Merged-In Ie774b142a7fab12d596ccd64872b781e3825e9ba with SHA-1 3e9da3ec47 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23183708 Change-Id: Ib52880fd18ff29567aab4171628d3cbd9c413138 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