tree 6a8e781a0c8f62c783da869da3a4ed7719ce738c
parent c3165142cff1510f22b01096829eb6f9d5bcab52
parent a13218c5549099d8f704a3677d48f098f7bb45c7
author Xin Li <delphij@google.com> 1599789779 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599789779 +0000

[automerger skipped] Merge Android R am: 5ff5c2c336 -s ours am: a13218c554 -s ours

am skip reason: Change-Id I609894770235673dc005d118062b9f8b4af08ba8 with SHA-1 70bf1e5994 is in history

Original change: https://android-review.googlesource.com/c/platform/external/libavc/+/1422355

Change-Id: I02b151169e247a757f532ec4cf95fde8042e9bcc