| commit | 839f3636261cd6f1db1f171f7535d79d18531e75 | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Thu Jul 14 02:41:15 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 14 02:41:15 2016 +0000 |
| tree | 1c53977d532706ea1f4186925c36c50d9298ab78 | |
| parent | 42c03e71a6c2285456ed3352d874a93fb7fffd26 [diff] | |
| parent | 4f71c20bcb1a950f85db76c7e62e418cd4a0fdaf [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 Change-Id: I48f9f11f9bafe1fe6fa4dd6483031ef6f61bb76a