tree 77a2e96c0d102dbc846a13bc59442d45ec5a103c
parent 5e8b2b0a3874f2d003d4bdbbb8621df73fbd323f
parent bd4b66c1a9821583ba738e6d94ca03b6c2dcbd5f
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1517506208 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1517506208 +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

Change-Id: I36f8ec554ac96cdef4669809c8923b4f8b56768b