Merge "Build / make problem" into experimental
authorYaowu Xu <yaowu@google.com>
Mon, 5 Nov 2012 19:55:44 +0000 (11:55 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 5 Nov 2012 19:55:44 +0000 (11:55 -0800)

Trivial merge