am 6a12ba4a: am 0ab338e5: Merge "Fix some warnings in border clamp tests." into mnc-dev
authorJarkko Pöyry <jpoyry@google.com>
Thu, 7 May 2015 08:18:22 +0000 (08:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 7 May 2015 08:18:22 +0000 (08:18 +0000)
* commit '6a12ba4abd9873c9b22f35b9c1791bc296c0514c':
  Fix some warnings in border clamp tests.


Trivial merge