Merge "Fix uint-to-float conversion warning"
authorPyry Haulos <phaulos@google.com>
Mon, 6 Apr 2015 23:17:31 +0000 (23:17 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 6 Apr 2015 23:17:31 +0000 (23:17 +0000)

Trivial merge