tree 664e1ba11c7578d113ab7363d0f726f5a30a6c26
parent 35826c6071b298f0455f659c591156bca2075ed9
parent cf872c1060b05aefc4a08b452a463dcec00c3fac
author Xin Li <delphij@google.com> 1607572014 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607572014 +0000

[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 01b93dd80c -s ours am: cf872c1060 -s ours

am skip reason: Change-Id I2e739d3606ba9f0938ebc2363cb9443ec3dec912 with SHA-1 f59c3864fe is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae4557ec8fdbfe5eea6a6e035374f2a86a2aa775