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)
am: 2b1df0008a

Change-Id: I2a8d904849b71156cda43aa7e44c377b34a17f10


Trivial merge