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)
commit88704275e823b4e3b5198a84d66905e844c509ea
tree1c6383f22ab26b159028cbc975a695dc7b73709f
parentb9d29ea2288a73691d0921398ed98db01bedfbfa
parent6bc2e7995999296f8bf69fcb99db43fed4adc2d8
am 6bc2e799: Merge "Fix -Wconversion warnings in shader tests."

* commit '6bc2e7995999296f8bf69fcb99db43fed4adc2d8':
  Fix -Wconversion warnings in shader tests.