| commit | fb7c6d91739721d7fa7a21c491ad52afe8ad135e | [log] [tgz] |
|---|---|---|
| author | Chong Zhang <chz@google.com> | Tue Jul 18 22:45:47 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 18 22:45:47 2017 +0000 |
| tree | 09e38b1b7fbca8021ec2d9ee2a1580b1bb3cae49 | |
| parent | 0b542a378927a807068ef5ecfa8db64fd7f81853 [diff] | |
| parent | b38111a0dbf0eddcfdcb0632f21a294092fdc651 [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 Change-Id: Id28fc6a835b1e7abf7d84642cfe4a1e8cfe04edc