Merge "fix a build error"
authorYaowu Xu <yaowu@google.com>
Mon, 22 Jul 2013 20:02:15 +0000 (13:02 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 22 Jul 2013 20:02:15 +0000 (13:02 -0700)
commit6261d7920671e4aadbd1da636a41012398679fd8
treeb148546a0d9f2d749fbaafa04840e408aee7764e
parent32bca36f510865da274c6b4ecaed12a74c43d4ea
parentfc186dcad63e45aaa978507ecc8c206be87b8ae1
Merge "fix a build error"