tree 6a8712d2ee5e0ba0247bbd8039c28eb930a03ffd
parent fbfd3d42d2f4fcbc627b713f5ba7f0540bc0a8d0
parent 35284f0c8442ae31dc9057583d2064c5257fae4f
author Vijay Pai <vpai@google.com> 1444163515 -0700
committer Vijay Pai <vpai@google.com> 1444163515 -0700

Merge pull request #3615 from dgquintas/gcc_520

Type conversion fixes to make GCC 5.2.0 happy