| commit | df83abca1d6609c26147e113950bd2b33166fbb1 | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Thu Jul 14 18:29:29 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 14 18:29:29 2016 +0000 |
| tree | 8d9d0ee47a9ed2ea6bc9a2654e8253f55410bc82 | |
| parent | 3c69172940e6c0c0b99bef3ac66481fd870d4c7b [diff] | |
| parent | c8950e29676cb13198e29b83a258f625da8c6b96 [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 Change-Id: I6f7ddb4be3d307bfa6457fa5b5e84d30a12f8e49