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

* commit '1f038a6f184f20d6dbae198a2bb86c67ef4a2a7b':


Trivial merge