Merge "Fix "error: 'memset' was not declared in this scope"."
authorElliott Hughes <enh@google.com>
Sat, 31 Jan 2015 06:55:36 +0000 (06:55 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Sat, 31 Jan 2015 06:55:36 +0000 (06:55 +0000)

Trivial merge