summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Christophe Pinelli <cpinelli@google.com> 2023-11-21 19:11:44 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-21 19:11:44 +0000
commit44cf76a44497d9090aac98e87a04aebb23935b31 (patch)
treedb5be758da37ad677fbed41bcf4720436458f4f4 /libs/androidfw/FileStream.cpp
parentd75dd811c5156b27c2bbb50ab7b7d448dcebd829 (diff)
parentf3e0e019b64dcc033491a98d0db38d505236e98a (diff)
[automerger skipped] Merge "Restrict activity launch when caller is running in the background" into rvc-dev am: dce6a262f7 am: f3e0e019b6 -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: I4fa31147def7e3cd4590248ea28c98fe03a05c6c 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