tree 73e11964e1bd09e092ae5b8c4d6ad12c93ee63f7
parent ce7e95b948ced374f038bc4732a7a5f52859b808
parent c039e42534fa50614174d7c814c453a48a49502d
author Chong Zhang <chz@google.com> 1500420082 +0000
committer android-build-merger <android-build-merger@google.com> 1500420082 +0000

Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88 am: 5f3ac3898d am: aafbda5a18 am: b226bba820 am: 8d579abf97 am: 2b1df0008a am: b38111a0db am: fb7c6d9173 am: ee1f46846d am: 8486817a65 am: 0ac0157213 am: a06a77509b am: 24145427ed am: 8a4f540bdf am: f62d2cf89a am: 719e24e823
am: c039e42534

Change-Id: Ifdd159b31a4c1caae63b987dca71614df4054a7b