am 6bc2e799: Merge "Fix -Wconversion warnings in shader tests."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 22 May 2015 20:45:27 +0000 (20:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 May 2015 20:45:27 +0000 (20:45 +0000)
* commit '6bc2e7995999296f8bf69fcb99db43fed4adc2d8':
  Fix -Wconversion warnings in shader tests.


Trivial merge