Merge "Fix build error caused by a merge conflict."
authorYaowu Xu <yaowu@google.com>
Fri, 14 Feb 2014 03:03:13 +0000 (19:03 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 14 Feb 2014 03:03:13 +0000 (19:03 -0800)
commit5dbdff0f60456e1e16d51139a8ca7e8a5b84fc4b
tree3ca676276f7a4d9b71cbdb7eb3684ca2481c43e9
parentbdd8966439070bccca1229fb43e6080dd86fa61c
parent2eccbd0f4bb060c5ac3369c83bd0f02e39ad97c2
Merge "Fix build error caused by a merge conflict."