tree d31ea6636bcb553e183815b3eb656115a5528cee
parent 4a438df4506d01a27afa015418f31994af2740bd
parent 1000cd1d232e040409321e79fdfb522eb9a6e0bb
author Phil Burk <philburk@google.com> 1593224131 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593224131 +0000

Merge changes I742a9d3d,Idce40ad2 into rvc-dev am: 1928cddbe9 am: b167113505 am: 1000cd1d23

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

Change-Id: I68b02a9d26559ac4adb965abba01307363331ba0