summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Diego Vela <diegovela@google.com> 2023-03-14 16:50:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-14 16:50:58 +0000
commitb527dc046e056278a74cd3983f31809e414fd638 (patch)
tree0fb224492c4860eda5ac410562816c12c5a119f0 /libs/androidfw/FileStream.cpp
parent56b0fe36e0be54cb552fd2cf0ee8968988a2cdca (diff)
parentc8aa82e618272134b0858d351908047ebd5ac5ce (diff)
[automerger skipped] Merge "Revert "Fix vulnerability in AttributionSource due to incorrect ..."" into tm-dev am: bc41a6529c am: c8aa82e618 -s ours
am skip reason: Merged-In Ic301a8518b8e57e1c9a2c9f2f845e51dca145257 with SHA-1 922e52bc3d is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21779363 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21893030 Change-Id: Ie9b7955b927317fff03efb532388af227b78ee20 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