| commit | bc282920de2d648e9e13802714e579a1e4c57b3a | [log] [tgz] |
|---|---|---|
| author | Chong Zhang <chz@google.com> | Tue Jul 18 23:21:47 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 18 23:21:47 2017 +0000 |
| tree | 73e11964e1bd09e092ae5b8c4d6ad12c93ee63f7 | |
| parent | 8e1f4be045f39a3aa00c7fee5dec8bafa7516c87 [diff] | |
| parent | c8d65474e1449518d7430467249368649af2adae [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 am: c8d65474e1 Change-Id: Iff4059de466ebf2ffced85ea550288f35e32a397