tree 7075cd123dcf44030a6618334b4c39cecdf3c5ed
parent b81d554ba6222b0824de8a6069a2ca85d5f4512c
parent c54946e6718db34d77dea5e46e40e9b0d1b31409
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1517528400 +0000
committer android-build-merger <android-build-merger@google.com> 1517528400 +0000

[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe am: fce9663d6f am: 658a02f977 am: 243be669b3 skipped: c2fe4b944b
am: c54946e671

Change-Id: I888519abe97d8fa1cfdd754b0aa7f74d91b07c54