Merge "fix IOCs"
authorYaowu Xu <yaowu@google.com>
Fri, 31 Jan 2014 23:33:22 +0000 (15:33 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 31 Jan 2014 23:33:22 +0000 (15:33 -0800)

Trivial merge