tree f8b4e58872d65d02c51f7b14fb1659f235421f91
parent 94e68196714d7a42c06bde027e28d9f35677fa33
parent 1329fe6887f9ff2ed3b12d960acb9cfeda34e83a
author Wonsik Kim <wonsik@google.com> 1615782219 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1615782219 +0000

Merge changes I47894ce3,Ibc2013cf,Ide4eb89b am: 532501a256 am: 1329fe6887

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1564488

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I27168c44f715982c4d561a1407fb9adc09b42be7