OSDN Git Service

Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev
authorChong Zhang <chz@google.com>
Tue, 18 Jul 2017 22:20:12 +0000 (22:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 22:20:12 +0000 (22:20 +0000)
commit98248c3f88a73bd93580f86c72642bfe9bf2a2db
treee7d341307cec0815d693bc9b3d76043410b5f22b
parentbd7db202c69ccd28414bcda7bee6f5cae1236885
parentd371d08bcc6762a522132fb0ba8c0495306a8f24
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev
am: d371d08bcc

Change-Id: I6b7dcadbed62315968055d98dd2ffba3228016f9