summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Christophe Pinelli <cpinelli@google.com> 2023-11-21 01:04:48 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-21 01:04:48 +0000
commit9dc603c80c5f1711969b0fa3b855706013ab0d95 (patch)
tree0beecdf174e00a76057b20314e133b7cba2092ab /libs/androidfw/FileStream.cpp
parent41f0b2f410e865185b96a7cb03edf78e8fe91d6a (diff)
parenta280c0d0b5ed3cd76dad8430c3265c5e90cb3281 (diff)
[automerger skipped] Merge "Restrict activity launch when caller is running in the background" into tm-dev am: 5f74ebdf62 am: a280c0d0b5 -s ours
am skip reason: Merged-In Ic88dd1e79b867b44cdcd6fc86650f5de6ebcc23d with SHA-1 e1edaa27ea is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23265596 Change-Id: Iaec69389ed60a265dbb539aec5dde89cdd4088b4 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