Merge "Renamed two files"
authorYaowu Xu <yaowu@google.com>
Fri, 15 Nov 2013 23:20:23 +0000 (15:20 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 15 Nov 2013 23:20:23 +0000 (15:20 -0800)

Trivial merge