ref: f70c80289c16ca681ffa58ad1f01f642c667a9ea
parent: e8103f36765c3e01fdca7ef2a37ceea6ed8ffe5d
parent: c369daf3ea163d0e1a72e43315d0023b93e40c4e
author: Yaowu Xu <yaowu@google.com>
date: Thu Jul 9 13:49:06 EDT 2015
Merge "Clean out more MSVC warnings"