commit | 1a05bc6cca9089943bcdd82d0b653d44324d1fc5 | [log] [tgz] |
---|---|---|
author | Robert Shih <robertshih@google.com> | Thu Jul 14 02:21:12 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 14 02:21:12 2016 +0000 |
tree | 7e432626ee84412cc18a5d0bc775468ae3aaae26 | |
parent | ee6a0eb2db1ac6bdf40753493d164ba4a188985f [diff] | |
parent | 02aa5b7f315c6c79dc306624e40f276269cf008a [diff] |
Merge \\\\\\\\"DO NOT MERGE - SoftMP3: memset safely\\\\\\\\" into klp-dev am: 3242dcf6e9 am: f4ad14f154 am: e3c1c2d734 -s ours am: a2f91257fd -s ours am: da2ac348fc am: 8635613bf3 am: d88de681cd -s ours am: 02aa5b7f31 Change-Id: Ia3b3ae9337fc4418666c8ab96a4366bba846f6e4