Merge "Remove conversion warnings from hbd shifts"
authorJohann <johannkoenig@google.com>
Thu, 28 May 2015 19:39:32 +0000 (19:39 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 28 May 2015 19:39:32 +0000 (19:39 +0000)

Trivial merge