ref: d5bcef524205f9cf53cca403c67c80b30b4159fc
parent: 32228ac13a7a338777a573e3a9e391dc2602bcc0
parent: 239e68ddbfa038e29b9e332503721d6bbae806c3
author: Jingning Han <jingning@google.com>
date: Tue May 27 12:58:00 EDT 2014
Merge "Fix compiling error in MSVS"