diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-13 23:28:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-13 23:28:41 +0000 |
| commit | c52a760ed7eeca49a718fdd15b91a88f0510f9fa (patch) | |
| tree | cd95935a063279329be527d8e3efda922edc4422 /identity/support/src/cppbor_parse.cpp | |
| parent | 8c0765e6f55583bb2906338614caab66b2022083 (diff) | |
| parent | 60b66078d01091cbb37e0282260cdac6561444c3 (diff) | |
Merge "[automerger skipped] audio HAL - fix UAFs am: 9f6d6ae26c -s ours am: 2b04128539 -s ours am: 290e356e20 -s ours am: 06f896205f -s ours am: 38565fed01 -s ours am: 4e2a9b4e7b -s ours am: 33210a97c7 -s ours" into sc-v2-dev-plus-aosp am: 60b66078d0 -s ours
am skip reason: Merged-In I5ec70b098a00746108e10ab39e966607d78c84ae with SHA-1 2f0fe27a2b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/14318053
Change-Id: I9892e83c3667e164f10f0f7ef4377582e2b1bf2f
Diffstat (limited to 'identity/support/src/cppbor_parse.cpp')
0 files changed, 0 insertions, 0 deletions