tree cf28ae96c1185754a8b64414852e5a84a3a1d1db
parent 6dd431c768db93c29ebaf8b3cea36e7533dcb08c
parent 08ae2e8d121b83253fde25efc02f90e8bb6f6db2
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1517506201 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1517506201 +0000

[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12

Change-Id: I6afb07170037b0e27738cbe7e53dc3d733fbd874