| commit | 8486817a6506fbd015bb293d30dc5d7db7dec508 | [log] [tgz] |
|---|---|---|
| author | Chong Zhang <chz@google.com> | Tue Jul 18 22:49:46 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 18 22:49:46 2017 +0000 |
| tree | 345df4b32970bac417ba2477b1661db5b622cf42 | |
| parent | a29bd6a709583f6774a5a98bac4f4fa2e9e790e3 [diff] | |
| parent | ee1f46846d6b35041adfd1120cbea1acab97b03a [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 Change-Id: I7c171b235bdb3349b43824616fedde741e626fde