am 6c0730fc: Merge "Fix "error: \'memset\' was not declared in this scope"."
authorElliott Hughes <enh@google.com>
Sat, 31 Jan 2015 07:49:32 +0000 (07:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 31 Jan 2015 07:49:32 +0000 (07:49 +0000)
* commit '6c0730fc1030bb41f8857ba5ff768dedb961dce0':
  Fix "error: 'memset' was not declared in this scope".


Trivial merge