Merge "Reduce code duplication"
authorYaowu Xu <yaowu@google.com>
Mon, 14 Apr 2014 21:39:50 +0000 (14:39 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 14 Apr 2014 21:39:50 +0000 (14:39 -0700)

Trivial merge