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)
commit7adfa9f4cb7341f1bdddad23946d216c107a0751
treeeca94b8afc8e719c7ec2889146a85bded4d6eb42
parent03eb63c1148be2c7267a8a01796dce700fe22fb7
parent8971338c6bb0ff3aeaa315d9f049611513c30141
Merge "change to avoid IOC"