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:45:47 +0000 (22:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 22:45:47 +0000 (22:45 +0000)
am: b38111a0db

Change-Id: Id28fc6a835b1e7abf7d84642cfe4a1e8cfe04edc


Trivial merge