OSDN Git Service

Merge \\\\\\"Fix corruption via buffer overflow in mediaserver\\\\\\" into klp-dev...
authorRay Essick <essick@google.com>
Wed, 13 Jul 2016 22:52:22 +0000 (22:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 13 Jul 2016 22:52:22 +0000 (22:52 +0000)
am: fbdd8670a0

Change-Id: I42f79dd854a98d8fe20e922a35db372b54fc53b8


Trivial merge