tree 39b2649e2f842086e0be8dd94ae5d7cfcdece347
parent 65c9a50e297d895467275d3a34550c447b01558f
parent 2a3725fae1a2285820fe6045672ced0c1bed0714
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578513234 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578513234 +0000

Merge "Fix android.media.cts.ImageReaderDecoderTest fail on MT6580 project" into qt-aml-media-dev am: 2bf9bd608e am: 2a3725fae1

Change-Id: Ie0aeaa362641d22d0ee43552fdfaed7015975058