| commit | f48edac5c4ea979423ce56f0d1d805c043fdb698 | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Thu Jul 14 02:27:04 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 14 02:27:04 2016 +0000 |
| tree | f26775f5c71dc937f754315d55c6003957ea265c | |
| parent | bb81ab726a9a41b20cc81a5abe475b89305f18ad [diff] | |
| parent | 1a05bc6cca9089943bcdd82d0b653d44324d1fc5 [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 Change-Id: I3a3d66fe39171481bdc3527c29fcd53f1074650d