| commit | c8d65474e1449518d7430467249368649af2adae | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Tue Jul 18 23:12:51 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jul 18 23:12:51 2017 +0000 |
| tree | 3bfd3dc002bed3a58ebab456263a82da7f05801c | |
| parent | c039e42534fa50614174d7c814c453a48a49502d [diff] | |
| parent | 1d8a77b66f3de24bcb75ce55fb6738648f9acff5 [diff] |
Merge "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: c3a8c93bc1" into oc-dr1-dev-plus-aosp