am e7c845a3: Merge "Fix int -> float conversion warning."
authorJarkko Pöyry <jpoyry@google.com>
Sat, 13 Jun 2015 00:52:49 +0000 (00:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 13 Jun 2015 00:52:49 +0000 (00:52 +0000)
* commit 'e7c845a3efb3b27e03d48245b3815b16af46e198':
  Fix int -> float conversion warning.


Trivial merge