ref: 9976ff8c793df91d9c15bbb772ddd46bb7e9530b
parent: f037cf80c97f415d65212989891d0440aecec07c
parent: 9ef37860cd689269e44a01da79c667a3dbf6f2a4
author: Yunqing Wang <yunqingwang@google.com>
date: Thu Jul 7 12:48:48 EDT 2016
Merge "Fix Visual Studio build warning"