diff options
| author | 2023-03-08 05:32:26 +0000 | |
|---|---|---|
| committer | 2023-03-08 05:32:26 +0000 | |
| commit | 145983ac196d6982cd2773415731b18c260be0db (patch) | |
| tree | 4ae144ec18ce399ae9b58c5d81ded1fd1ae5c630 /libs/androidfw/StringPool.cpp | |
| parent | fd8bfb6d14bf9c7636120807e3ba6b6b049c340a (diff) | |
| parent | 5ce988eb158d4ce5e515071f6bfacde10e319b81 (diff) | |
[automerger skipped] Merge "Revert "Fix vulnerability in AttributionSource due to incorrect ..."" into tm-dev am: bc41a6529c am: 0e408f940b am: 3ab864b584 am: 5ce988eb15 -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: I83c1ed63b8036fe44dc5dc3f9a7df97364f666b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions