tree 74693484faeceb358a96ef8d2d8a9a6fbb1e95f7
parent 1ce9a79b52c93572726e25effc4c6d35c2567a1c
parent fec52a666d8b1a4c014df5498f14026756267529
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1517554764 +0000
committer android-build-merger <android-build-merger@google.com> 1517554764 +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

Change-Id: I86182e0f6471b424c5ff47d109986a2c27834f89