| commit | 8a4f540bdff1dc12dc1fec4602e9a672483e9eeb | [log] [tgz] |
|---|---|---|
| author | Chong Zhang <chz@google.com> | Tue Jul 18 22:59:19 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 18 22:59:19 2017 +0000 |
| tree | 2e13c43fc7251b547dbcd999289d701d258fc1fa | |
| parent | dfd2808073fc5f6b6bf5680f9b4c153251a61c2a [diff] | |
| parent | 24145427edc6e36a5442e7f1e9a7fa56038f4f36 [diff] |
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 Change-Id: I55ab577a8a2cee7d819439a0c6e04d88248523b9