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

Change-Id: I97fadf1674b9158656c39f2a5f6d289e6483a381


Trivial merge