tree 014b598bf70d7302655354e705b254cdd3af4793
parent d6b29883ff278067efef27624bfe7807c759438e
parent 67e9a995ceb2e80d7e0cbf57f00ed3954deca948
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1517542932 +0000
committer android-build-merger <android-build-merger@google.com> 1517542932 +0000

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

Change-Id: I43b81c7a7f8e1fbe4143b0262eaad72d3286f8da