commit | 426708f0d81584ca304b28c28a00dd9747c005e2 | [log] [tgz] |
---|---|---|
author | Robert Shih <robertshih@google.com> | Thu Jul 14 18:19:58 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 14 18:19:58 2016 +0000 |
tree | 831a082fb1217c807d9cee37a42f7d22dbfdf4d2 | |
parent | b2b56d1f0af7db5b817ad516cf8d575e4420e13d [diff] | |
parent | 9f7ef49df4c95a5b196c54d36ca7ec480b5e347e [diff] |
Merge \\\\"DO NOT MERGE - SoftMP3: memset safely\\\\" into lmp-dev am: d5573715d8 -s ours am: f2fffc9fd0 am: 047fb889cc am: 9f7ef49df4 -s ours Change-Id: If5670ac1cde5b28e1993344176682e6479932aa5