tree 587b9ec80a343b1baa3034a51c1869d9da0021dd
parent 63f85438e02965466b140351876469ec09f86591
parent 3879f37c8eb3ff838f03b89e8e7cdfcd19611ce4
author Lajos Molnar <lajos@google.com> 1614118315 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614118315 +0000

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I39275b4a1f1a002f3c46509a9c6d3ceded1caa38