am 0ab338e5: Merge "Fix some warnings in border clamp tests." into mnc-dev
authorJarkko Pöyry <jpoyry@google.com>
Mon, 11 Jan 2016 19:32:35 +0000 (19:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:32:35 +0000 (19:32 +0000)
am: 6a12ba4abd

* commit '6a12ba4abd9873c9b22f35b9c1791bc296c0514c':


Trivial merge