| commit | 7ebe84bc10fc213a4ff0dde18289776dbfdf8d5d | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Thu Jul 14 02:43:27 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 14 02:43:27 2016 +0000 |
| tree | d28291b71856aea6bc03ca17074c8b8721a09d9d | |
| parent | 88c998f53ff69267318339fa0a0cf4500f297276 [diff] | |
| parent | 839f3636261cd6f1db1f171f7535d79d18531e75 [diff] |
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 am: d88de681cd -s ours am: 02aa5b7f31 am: 1a05bc6cca am: f48edac5c4 am: 4f71c20bcb -s ours am: 839f363626 Change-Id: Icd3f4beb267e275b67be6bcf597523ebbf04c34c