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 23:03:50 +0000 (23:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 23:03:50 +0000 (23:03 +0000)
am: f62d2cf89a

Change-Id: I94dd3c484f858660b4d97e7689dd2fbba845db7e


Trivial merge