tree 7075cd123dcf44030a6618334b4c39cecdf3c5ed
parent 67e9a995ceb2e80d7e0cbf57f00ed3954deca948
parent fed4ae111566dc68e178d625f2ef14b46f779dcb
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1517528417 +0000
committer android-build-merger <android-build-merger@google.com> 1517528417 +0000

[automerger skipped] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info skipped: 8b0edf42a0
am: fed4ae1115

Change-Id: I3bb2c6e954a5d5212c976a1f6e1549a62352423a