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