summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Christophe Pinelli <cpinelli@google.com> 2023-11-21 02:10:57 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-21 02:10:57 +0000
commite0ef9564f8fdb41edcdbdcd695ec87af197709cc (patch)
treeea8330bb63d1d38dbc28de2793f8858d76d74e40 /libs/androidfw/FileStream.cpp
parent48a2329392f890e85d251abaf8a1d61b87953698 (diff)
parentc89179da4b999f8a594f7dbaaa8225f7ff7ef3a3 (diff)
[automerger skipped] Merge "Restrict activity launch when caller is running in the background" into tm-dev am: 5f74ebdf62 am: e3f384b963 am: 8f988ac497 -s ours am: 1456fb3432 -s ours am: c89179da4b -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: I5aaf71277f33c1792f82fc3d1f3a1e7752dccd45 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