Commit 70548828 authored Dec 10, 2020 by Treehugger Robot Committed by Automerger Merge Worker Dec 10, 2020

[automerger skipped] mpeg4 decoder: Enable support for quant_type 1 am: ab5299e6 -s ours

am skip reason: Change-Id I4396b5e6b6b4e75607a305683c7e7d7ef30eb648 with SHA-1 bf3f05e8 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c1e73739364274d2d84236903a030bcee3bc8e2

There are no changes