tree 2a6dad1ac156db4681b177bc903bb57ece4a29f9
parent 01f66bfe17a8d27c9732551fa98c8e53e1bb8efd
parent a2a0264d1ac82b14a1c53082142c1a837c710ced
author Lajos Molnar <lajos@google.com> 1620100652 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620100652 +0000

Merge changes Ia8e2451f,I474794e6 am: 9c8c0f2420 am: a2a0264d1a

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

Change-Id: I622a2c08e8b99444222f96f1fdbcdc6573438b7b