am 0fbaeab9: Merge "Allow any int -> float rounding in state query utils." into mnc-dev
authorJarkko Pöyry <jpoyry@google.com>
Mon, 11 Jan 2016 19:36:04 +0000 (19:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:36:04 +0000 (19:36 +0000)
am: c71de18307

* commit 'c71de18307ef4a04c201fe1a23d99280539bc44f':


Trivial merge