Merge "fix static analysis warnings related to CHECK_MEM_ERROR"
authorJames Zern <jzern@google.com>
Wed, 25 Mar 2015 06:56:04 +0000 (23:56 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 25 Mar 2015 06:56:04 +0000 (23:56 -0700)

Trivial merge