OSDN Git Service

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

Change-Id: I5a1d3e49a82b031a74d48396ee719410d8e6a09a


Trivial merge