tree d04e052c8c5684657d3b5e8785d59d6fa8a46c1b
parent f8460df564385af2197ffccb4d4004fd96d0eddd
author David Garcia Quintas <dgq@google.com> 1443913029 -0700
committer David Garcia Quintas <dgq@google.com> 1443913029 -0700

Type conversion fixes to make GCC 5.2.0 happy