tree 77a2e96c0d102dbc846a13bc59442d45ec5a103c
parent c9026ad89b2a78df7ecc503f35081d1db82403d7
parent e94aa9aa3cdb6194cd5f3be9ecf047909dd400e4
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1517428119 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1517428119 +0000

[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05 am: 14728790d3 am: 1296b91454 am: e94aa9aa3c

Change-Id: I528d8dccae1e59c965dc4fcfae65ace1181886c6