summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Christophe Pinelli <cpinelli@google.com> 2023-11-21 21:23:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-21 21:23:13 +0000
commitae515c253c186d228afcc0c266a86c1cdf537c1a (patch)
treead03940747f6a82ec84d9487594bbfe86efa940b /libs/androidfw/FileStream.cpp
parent459ece679763b9f17d744c59ee87430765c274a8 (diff)
parent192afbf33618b95022455dcebdd7d1a05c532ac1 (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 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: I2bd0ddcd1782b40323565436cefb4606f7b792f5 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