tree a7a7a2d8ce7f24d34d5a562ca9e873c03dda6da4
parent 1a7492b10c565135407ccd9a7eb7038e44716923
parent b6b00fc651f952a0702ba2f877b5c2aeb4d8f5ca
author Robert Shih <robertshih@google.com> 1468522385 +0000
committer android-build-merger <android-build-merger@google.com> 1468522385 +0000

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
am: b6b00fc651

Change-Id: I6c0ce5d39bf63c70246a50fdf62571d82383ca24