commit | 02aa5b7f315c6c79dc306624e40f276269cf008a | [log] [tgz] |
---|---|---|
author | Robert Shih <robertshih@google.com> | Thu Jul 14 02:03:29 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 14 02:03:29 2016 +0000 |
tree | eea7ced93ca6036b0650c598a2137c4244aab031 | |
parent | 20aa1c9447dc2183b2e18bbf042afc290fe94955 [diff] | |
parent | d88de681cdbbd1074cc5ca31e6a6f99e2be0fc1e [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 Change-Id: I081055beacca8e362ff4a0e80221586918167e41