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:58:04 +0000 (01:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Jul 2016 01:58:04 +0000 (01:58 +0000)
commitd88de681cdbbd1074cc5ca31e6a6f99e2be0fc1e
tree85f429770198238ac3b50decd1e1678aa5800862
parentd4e82b9e6e172c84f9d27558b174f9b3e37ee0ac
parent8635613bf301ea57fbe53a2683972fd67166f31e
Merge \\\\\\"DO NOT MERGE - SoftMP3: memset safely\\\\\\" into klp-dev am: 3242dcf6e9 am: f4ad14f154 am: e3c1c2d734  -s ours am: a2f91257fd  -s ours am: da2ac348fc
am: 8635613bf3

Change-Id: I534362c8ac08d793e2e9b19190a3091c252edc66