OSDN Git Service

Merge \\\\\"DO NOT MERGE - SoftMP3: memset safely\\\\\" into klp-dev am: 3242dcf6e9...
authorRobert Shih <robertshih@google.com>
Thu, 14 Jul 2016 01:49:30 +0000 (01:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Jul 2016 01:49:30 +0000 (01:49 +0000)
am: da2ac348fc

Change-Id: I6d0517817b12073b3ce93dcfe14626399770a1fb


Trivial merge