summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author William Leshner <wleshner@google.com> 2023-11-04 03:05:04 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-04 03:05:04 +0000
commitc49d99a032d3450f794bcded8af571d51c4757e8 (patch)
treeea3bea53451b70d37e84a7390b802f731bfad15e /libs/androidfw/FileStream.cpp
parent9bbc7a8298a4ed5d9dbc0282cbb17c9858bb930b (diff)
parent44930c129cedd80b30f4aa8e4bed1238498a66e5 (diff)
[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into rvc-dev am: 6b55e12830 am: eebdc4c3b6 am: 66864c7ac8 am: 43bc68b845 am: 9a24157c26 -s ours am: a54dfa09e3 -s ours am: 6d2665c1f7 -s ours am: cf1cde0ec6 -s ours am: 87de398333 -s ours am: 44930c129c -s ours
am skip reason: Merged-In I146415ad400827d0a798e27f34f098feb5e96422 with SHA-1 bf8ff047eb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25238611 Change-Id: I886f3924666d5abc9c4d1e951e4a8308b37668cb 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