diff options
| author | 2024-01-30 14:24:45 +0000 | |
|---|---|---|
| committer | 2024-01-30 14:24:45 +0000 | |
| commit | 5ad97b5264a696d9ca82e0620fc5e702ba547dfe (patch) | |
| tree | 16a4118ad1d80378dbff7ce762987140d776bb2f /libs/hwui/FrameInfoVisualizer.cpp | |
| parent | bfd3ca336f8b03eb6698fc6267fca1b636ba7f20 (diff) | |
| parent | fc69a3424c2e6806d6082bbefea5baa0db6e94d8 (diff) | |
[automerger skipped] Merge "Revert^2 "Revert "Fix vulnerability in AttributionSource due to in..."" into tm-dev am: d42b60e926 am: a17065fc31 -s ours am: 9e5f87b843 -s ours am: fc69a3424c -s ours
am skip reason: Merged-In Ic301a8518b8e57e1c9a2c9f2f845e51dca145257 with SHA-1 922e52bc3d is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26057828
Change-Id: I7f4a388d441f502272b05016c5c8c192c665e419
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/hwui/FrameInfoVisualizer.cpp')
0 files changed, 0 insertions, 0 deletions