Merge "Prevent access to invalid pointer"
authorYaowu Xu <yaowu@google.com>
Tue, 15 Oct 2013 21:28:15 +0000 (14:28 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 15 Oct 2013 21:28:15 +0000 (14:28 -0700)

Trivial merge