commit | 42f977c44f204fb6f087fac080c4c05621048da3 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 09:00:11 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 09:00:11 2021 +0000 |
tree | c648bf7eeb74aeac43906c6863bbab1d07033e8d | |
parent | c84ab80a8b230635d1126341f8bf0da936323eaa [diff] | |
parent | 60b263baf26acc3cdcb688b725e9127a111df2a9 [diff] |
[automerger skipped] Merge Android 12 am: 12e23d0f91 -s ours am: 1383f9a18f -s ours am: 2de22834e1 -s ours am: 6437b333a6 -s ours am: 60b263baf2 -s ours am skip reason: Merged-In I5e6d1f815848beed302adcb643ca9cd9bae5a31e with SHA-1 d378c44714 is already in history Original change: https://android-review.googlesource.com/c/platform/external/libavc/+/1847357 Change-Id: I87d45ef3c8190bda6d41d861923a527282e1ead5