| commit | c039e42534fa50614174d7c814c453a48a49502d | [log] [tgz] |
|---|---|---|
| author | Chong Zhang <chz@google.com> | Tue Jul 18 23:11:57 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 18 23:11:57 2017 +0000 |
| tree | 3bfd3dc002bed3a58ebab456263a82da7f05801c | |
| parent | 62a307a8265ae382f244c75fcf119aa8447fe881 [diff] | |
| parent | 719e24e82381cccdcb84524c5bef9a3b3ad7c1b4 [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 am: 719e24e823 Change-Id: I97fadf1674b9158656c39f2a5f6d289e6483a381