Merge "Fix some interger overflow errors"
authorHui Su <huisu@google.com>
Wed, 3 Feb 2016 18:12:26 +0000 (18:12 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 3 Feb 2016 18:12:26 +0000 (18:12 +0000)

Trivial merge