Merge "Fix int -> float conversion warning."
authorJarkko Pöyry <jpoyry@google.com>
Sat, 13 Jun 2015 00:42:51 +0000 (00:42 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 13 Jun 2015 00:42:52 +0000 (00:42 +0000)

Trivial merge