Merge "Resolve -Wshorten-64-to-32 in variance."
authorAlex Converse <aconverse@google.com>
Tue, 2 Aug 2016 22:26:55 +0000 (22:26 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 2 Aug 2016 22:26:55 +0000 (22:26 +0000)

Trivial merge