tree 067e8080b477802aac9196d2670ed96d3c99e2ef
parent 76c337710ecda664f2701f166b2d168df0eaf1e0
parent 39c92dd8fc04b45ee62b28f9144bef0203a00a7e
author Treehugger Robot <treehugger-gerrit@google.com> 1613506047 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613506047 +0000

Merge changes I39f15cc4,I9639692c,I0a10bacc am: 39c92dd8fc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6a511a8540f604c516d7cc760e8e643c470da735