summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Christophe Pinelli <cpinelli@google.com> 2023-11-22 00:07:29 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-22 00:07:29 +0000
commit353d3c6219d0d60334922e59e5ea9b1f1c4cfd77 (patch)
treecd0d585e67ffe1b53ab54b9f636df981ef83afbd /libs/androidfw/FileStream.cpp
parent455a97b7b535bbd301477b0af94f08eade9e488e (diff)
parent2130fab5840ee66c8b3034ab08d2d96093dbf0fb (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: 1f6e0e420a -s ours am: 2130fab584 -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: Id020d6ecbbeb4925139537cc966c8e578ed86724 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