Merge "WORKAROUND FIX FOR GCC4.9.1"
authorYunqing Wang <yunqingwang@google.com>
Tue, 4 Nov 2014 00:56:38 +0000 (16:56 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 4 Nov 2014 00:56:38 +0000 (16:56 -0800)

Trivial merge