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:43:44 +0000 (22:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 22:43:44 +0000 (22:43 +0000)
commitb38111a0dbf0eddcfdcb0632f21a294092fdc651
treec5095ef19b99abd42317558fb3da033fa79c717c
parent998521559aa746cc7b44583c834f1ef88844809b
parent2b1df0008ab546db68325b523d89bd93647b4a4a
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

Change-Id: I2a8d904849b71156cda43aa7e44c377b34a17f10