Merge "change to avoid IOC"
authorYaowu Xu <yaowu@google.com>
Sat, 25 Jan 2014 00:05:13 +0000 (16:05 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Sat, 25 Jan 2014 00:05:13 +0000 (16:05 -0800)

Trivial merge