tree 57451030abf3be4b2ae2a091bbcc0c05502c2090
parent d8828f34500e942d2004cca1f08f9a061a308cf7
parent 88d43f631a9bd75fde2948ffb737b20bc18228bd
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1517583356 +0000
committer android-build-merger <android-build-merger@google.com> 1517583356 +0000

[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: e2fb9f0ac6 am: 4b684c6690 skipped: 000fe3d02d am: dcbb54a6ec am: 67e9a995ce am: fec52a666d
am: 88d43f631a  -s ours

Change-Id: Idf901fae7d4b3a6ebfdf43c4a078ea81635b44de