summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Christophe Pinelli <cpinelli@google.com> 2023-11-21 16:41:04 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-21 16:41:04 +0000
commit9cc34f412bc7baa0d1eca83714d2bdaf65e91cb0 (patch)
treeca3eb7695dd407cc47d8f1ed90a2f3addbbafe4f /libs/androidfw/FileStream.cpp
parentc89179da4b999f8a594f7dbaaa8225f7ff7ef3a3 (diff)
parentb1fb7ea50141d2226702f5fba5be0975e9fbf8f7 (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: 93213f9417 -s ours am: b1fb7ea501 -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: I4824494103e41488c5142844721ad2a72d67acc5 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