tree a91cc283b1f9ec62d162cadebabd4ee572d86496
parent e8dd475879f8543ed43046d1294109122a51561a
parent 998e71e1871040786461f741291af464b1305982
author Ray Essick <essick@google.com> 1468450658 +0000
committer android-build-merger <android-build-merger@google.com> 1468450658 +0000

Merge \\\\\\\\"Fix corruption via buffer overflow in mediaserver\\\\\\\\" into klp-dev am: b5299033ce am: 357e0f132e am: efa1272404 am: e20f434b16 am: 63b7b724b0 am: fbdd8670a0 am: b528c30f00
am: 998e71e187

Change-Id: I8d9d6b52391acf703b2f18f0385648e3ef10d948