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)
commitfb216e507274b2c34a4dbe180b52c7ec180f993a
tree59ce0a82aebbcc73623dd9f32005387e53cba285
parent2b76478892d509b877901215e73a5b07346ae9cd
parentaf341b0c3a08bbcc50771d61781b0646126e8ee0
am af341b0c: Merge "Fix -Wconversion warnings in shader tests."

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