am af341b0c: Merge "Fix -Wconversion warnings in shader tests."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 22 May 2015 19:55:50 +0000 (19:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 May 2015 19:55:50 +0000 (19:55 +0000)
* commit 'af341b0c3a08bbcc50771d61781b0646126e8ee0':
  Fix -Wconversion warnings in shader tests.


Trivial merge