commit | c8950e29676cb13198e29b83a258f625da8c6b96 | [log] [tgz] |
---|---|---|
author | Robert Shih <robertshih@google.com> | Thu Jul 14 18:27:02 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 14 18:27:02 2016 +0000 |
tree | 9313adb5aa1a44d8e135011874fb27b629206a12 | |
parent | 2d09be5831f7f7dfefccb0a1c45b2c791e98045f [diff] | |
parent | 5affad8fc5d2965034b19c3ad9a8e3b8992d2bb8 [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 am: 5affad8fc5 Change-Id: I1425a3088abbbcffca2af9f8533b6168febb6ec4