OSDN Git Service

Merge \\\"DO NOT MERGE - SoftMP3: memset safely\\\" into lmp-dev am: d5573715d8 ...
authorRobert Shih <robertshih@google.com>
Thu, 14 Jul 2016 18:15:20 +0000 (18:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Jul 2016 18:15:20 +0000 (18:15 +0000)
am: 047fb889cc

Change-Id: I09b46561d6490b0693e0f37e3b770a50de2b82f2


Trivial merge