| commit | 4f71c20bcb1a950f85db76c7e62e418cd4a0fdaf | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Thu Jul 14 02:29:50 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 14 02:29:50 2016 +0000 |
| tree | 456be621f14a9c4cf3895de1595f3e4e9c9f75b0 | |
| parent | 9a235c9b2c0b9281cfe7a9df2532a3f906592a17 [diff] | |
| parent | f48edac5c4ea979423ce56f0d1d805c043fdb698 [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 Change-Id: I655e2dee8fac7b7819ba53a0431ef6a85eb7b8e2