tree 1440cf6ce2e4bf35df4371e3653b0b28c9af6be4
parent 813b34fd5c5786617a84675316f877a13284a2d6
parent ec895dd834a6718c3127346793ec70de46267214
author Lajos Molnar <lajos@google.com> 1614117277 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614117277 +0000

Merge changes I426dc1f7,I7502f09f am: ec895dd834

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I17e8647885e257617ed8f6f30dc40332a0de9ad8