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)
commit8635613bf301ea57fbe53a2683972fd67166f31e
treeaa091ad9426bc2236873f0f76acb7897867c3c8d
parent12165c481f1c515acbec36b4043e47b5696659de
parentda2ac348fc3b33c750d29b6e65371819d9fedf8b
Merge \\\\\"DO NOT MERGE - SoftMP3: memset safely\\\\\" into klp-dev am: 3242dcf6e9 am: f4ad14f154 am: e3c1c2d734  -s ours am: a2f91257fd  -s ours
am: da2ac348fc

Change-Id: I6d0517817b12073b3ce93dcfe14626399770a1fb