| commit | c3a8c93bc1a1337243b893b237ed03ff146616a1 | [log] [tgz] |
|---|---|---|
| author | Chong Zhang <chz@google.com> | Tue Jul 18 23:03:50 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 18 23:03:50 2017 +0000 |
| tree | 3eb8bfb0dfff7d555346625113f1548cbf0c821d | |
| parent | 6fa5e381544556a292609c1537619d861f382c83 [diff] | |
| parent | f62d2cf89a0a39df6f2791427b1e142440c1947e [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 am: 8a4f540bdf am: f62d2cf89a Change-Id: I94dd3c484f858660b4d97e7689dd2fbba845db7e