commit | 0ac0157213733d37db1b8c5dac19bedcdea81d2e | [log] [tgz] |
---|---|---|
author | Chong Zhang <chz@google.com> | Tue Jul 18 22:52:48 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 18 22:52:48 2017 +0000 |
tree | 551bb5c30e9ec60fa251321cd106f83a109ea835 | |
parent | d7c144c545563ee7acab4c4627407c5da634c532 [diff] | |
parent | 8486817a6506fbd015bb293d30dc5d7db7dec508 [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 Change-Id: I94eb3461b170d5695111ce12208713221e5ebb17