Merge "Allow any int -> float rounding in state query utils." into mnc-dev
authorJarkko Pöyry <jpoyry@google.com>
Wed, 10 Jun 2015 15:19:41 +0000 (15:19 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 10 Jun 2015 15:19:42 +0000 (15:19 +0000)

Trivial merge