am 7bcb5fc9: Merge "Fix -Wconversion warnings in clipping tests."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 22 May 2015 19:41:34 +0000 (19:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 May 2015 19:41:34 +0000 (19:41 +0000)
* commit '7bcb5fc9a75ad01c6134a49dc0369d62b87dd34c':
  Fix -Wconversion warnings in clipping tests.


Trivial merge