Merge "Fix compile error in Chromium building."
authorJackyChen <jackychen@google.com>
Wed, 21 Jan 2015 22:52:32 +0000 (14:52 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 21 Jan 2015 22:52:32 +0000 (14:52 -0800)
commitcd0830f4526d4d12658c285ee49276fecba887cd
tree93630a8a2d52442d424e82e5b5f4aa80f71b5192
parentaaa31a3164b912a86149627ca98e98fdfce6f441
parent25a19b48ff428e9b1345ff8495371b02d87b378a
Merge "Fix compile error in Chromium building."