summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Christophe Pinelli <cpinelli@google.com> 2023-11-21 23:00:53 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-21 23:00:53 +0000
commitfb57297040cad3bba7eaa90379d28e4dde7d96c0 (patch)
treecd0d585e67ffe1b53ab54b9f636df981ef83afbd /libs/androidfw/FileStream.cpp
parentc808b102994b2d7404b935147404bc352fff9a90 (diff)
parent082ab3fc5b76f7df7108fc984fe371061e678943 (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: 082ab3fc5b -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: Ibab615c2b0798a5af4de4d8c679a8c4268fe1c02 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