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)
commite7c845a3efb3b27e03d48245b3815b16af46e198
tree2bb013af84595f668e1a35d71f10541ff25b7f2d
parent96f69912b83f0dc85a0a7f66d1ba49813c3f5dd2
parent6545ee9f6c68d14c63965e8902eafac8b4ee35f8
Merge "Fix int -> float conversion warning."