| commit | b6b00fc651f952a0702ba2f877b5c2aeb4d8f5ca | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Thu Jul 14 18:47:14 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 14 18:47:14 2016 +0000 |
| tree | 40c422a55f5583e55717a63a1938b453d06be71c | |
| parent | fd778b20ededf0ca94f1e3668665d9fce47bf7b7 [diff] | |
| parent | df83abca1d6609c26147e113950bd2b33166fbb1 [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 am: c8950e2967 am: df83abca1d -s ours Change-Id: Ia93b7fb2bcb7c92bde2d65836a4bbe2c1ff8b1a4