ref: cd0830f4526d4d12658c285ee49276fecba887cd
parent: aaa31a3164b912a86149627ca98e98fdfce6f441
parent: 25a19b48ff428e9b1345ff8495371b02d87b378a
author: JackyChen <jackychen@google.com>
date: Wed Jan 21 09:52:32 EST 2015
Merge "Fix compile error in Chromium building."