tree 40c422a55f5583e55717a63a1938b453d06be71c
parent 0c420366737c4c3b9d07fd38d693a59774b0b0e3
parent 3c69172940e6c0c0b99bef3ac66481fd870d4c7b
author Robert Shih <robertshih@google.com> 1468522033 +0000
committer android-build-merger <android-build-merger@google.com> 1468522033 +0000

Merge \\\\"SoftMP3: memset safely\\\\" into mnc-dev am: b2b56d1f0a am: 5d6fe83821 am: 2d09be5831
am: 3c69172940

Change-Id: Ifa3581fedd391417e61ad9f576023b8f9e590ea4