am 29c73cab: Merge "Fix -Wconversion warnings in vertex texture tests."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 22 May 2015 19:41:32 +0000 (19:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 May 2015 19:41:32 +0000 (19:41 +0000)
* commit '29c73cab8606bc6c7b34b8c56ff6de9b00c2fa7e':
  Fix -Wconversion warnings in vertex texture tests.


Trivial merge