diff options
| author | 2023-07-11 18:56:08 +0000 | |
|---|---|---|
| committer | 2023-07-11 18:56:08 +0000 | |
| commit | ba12d5f12c03e005678c3f40cdb0e8846f5ef7fa (patch) | |
| tree | b4f65cda6707af52f43dff497dbd8df2565c7ac6 /libs/androidfw/AssetsProvider.cpp | |
| parent | 8487ca8962014e825ef555faa00b7d865cfc8a02 (diff) | |
| parent | 3f1b9a7accb14167395479d8517e51ae78485f3b (diff) | |
[automerger skipped] Merge "DO NOT MERGE Revert "Revert "Fix vulnerability in AttributionSource due to in..."" into tm-qpr-dev am: e326cb83e8 am: 15d80074e3 -s ours am: 3f1b9a7acc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23590386
Change-Id: I68fc655f60a0bbffcdc38d5b118f0b1c601439b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions