ref: 7e491de1c487186bd2adb6b6907b8d0d1869f846
parent: 92440e82fd01132a179f20a43b0d3b3557dfba10
parent: 2c4fee17bcd3e64d8f831c637b34caab98e965d5
author: Yaowu Xu <yaowu@google.com>
date: Wed Nov 5 10:34:13 EST 2014
Merge "Fix visual studio 2013 compiler warnings"