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:39:13 +0000 (22:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 22:39:13 +0000 (22:39 +0000)
commit8d579abf973dea7004ba995fca6c5f7bb59be3b2
tree081f1787b26ec35e608a5179193064aba5a32b02
parente0f496358416abebeb7ba971a354ec69cb1848d4
parentb226bba82033bc2e822b0fcb75f941095e4d8265
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88 am: 5f3ac3898d am: aafbda5a18
am: b226bba820

Change-Id: Iab6732cf5c86c6dec646df209e0f18b6c355780e