tree c1f9ebf43e40f42dd819b8ed6e4ecbba39c3185a
parent e943f96ffbdfd6d2b208a2868095c2a52628aab1
parent 8c7032dfab7f78789ec70b96ae5342f674a920ca
author Lajos Molnar <lajos@google.com> 1614120733 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614120733 +0000

Merge changes I426dc1f7,I7502f09f am: ec895dd834 am: 3879f37c8e am: 8c7032dfab

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0486e32ebefa2bc0c700d0ec17ad1fc7c86c8101