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:43:50 +0000 (01:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Jul 2016 01:43:50 +0000 (01:43 +0000)
commitda2ac348fc3b33c750d29b6e65371819d9fedf8b
treeaa091ad9426bc2236873f0f76acb7897867c3c8d
parent67443ebc81857ff58a68f153ecae7559a3931133
parenta2f91257fd873152a2a2a25f2f842efdaa53d846
Merge \\\\"DO NOT MERGE - SoftMP3: memset safely\\\\" into klp-dev am: 3242dcf6e9 am: f4ad14f154 am: e3c1c2d734  -s ours
am: a2f91257fd  -s ours

Change-Id: I64c9657a66aa2e818ebc002af31591e6db51907d