Merge "Resolve configuration conflict"
authorYaowu Xu <yaowu@google.com>
Tue, 21 Apr 2015 15:00:49 +0000 (08:00 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 21 Apr 2015 15:00:49 +0000 (08:00 -0700)

Trivial merge