ref: 0979dbb37b360d51dd5c64d9b42ba7cb997463ca
parent: 4e00f56cd6f664c14b7f657d722f63e9832434d4
parent: 364b92dc88f67166cac4c0d6d008fbbfc93fddba
author: Yaowu Xu <yaowu@google.com>
date: Tue Jan 6 03:01:47 EST 2015
Merge "Fix compiler warnigns for msvc2013"