commit | 047fb889cc6c74df4b838510483a8218fa2226de | [log] [tgz] |
---|---|---|
author | Robert Shih <robertshih@google.com> | Thu Jul 14 18:11:42 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 14 18:11:42 2016 +0000 |
tree | 90963cfee9c39f6029a4b1f3de127e1890709812 | |
parent | 012d1246ceaaedbbbef3922ac9bc47eadf53c1ce [diff] | |
parent | f2fffc9fd03e4084ef2659ee90779ef036ba6d5f [diff] |
Merge \\"DO NOT MERGE - SoftMP3: memset safely\\" into lmp-dev am: d5573715d8 -s ours am: f2fffc9fd0 Change-Id: I5a1d3e49a82b031a74d48396ee719410d8e6a09a