tree 7075cd123dcf44030a6618334b4c39cecdf3c5ed
parent 991036b9f8173fc3a996bdb91267eb844e8e0775
parent bb38f901b484296fad21006cc85d2a1ae9a328d2
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1517528384 +0000
committer android-build-merger <android-build-merger@google.com> 1517528384 +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

Change-Id: I6faf7e4a0bbb8ed6a11cd77dbe749c8e6bf59ade