tree 57451030abf3be4b2ae2a091bbcc0c05502c2090
parent 9f487b9566425d2be002d85cc4ced8127fcb6734
parent 9ab6f29ae0e9ae2250c2fd600ea3194300b9e97e
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1517583334 +0000
committer android-build-merger <android-build-merger@google.com> 1517583334 +0000

[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c am: bd4b66c1a9 am: 464c4336ad skipped: 233344c45c am: bb38f901b4 am: e12ed0c4fb am: 27e0af2ad1
am: 9ab6f29ae0  -s ours

Change-Id: I79afffd974b455d192aa1259514ac8c0d8f48202