am a35f7389: Merge "Fix -Wconversion warnings in GLES31 module."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 22 May 2015 00:48:01 +0000 (00:48 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 May 2015 00:48:01 +0000 (00:48 +0000)
commitacd395cef1ce2ad7f23250d37a95ea479681e8ad
tree6d19cf2f2a7e4cfa3f85f07ad70a5f838327c26e
parent786c99d6f5ed0429665631b83f830a3a6d693ad3
parenta35f7389107fa54395137ff631c08551cff6eb05
am a35f7389: Merge "Fix -Wconversion warnings in GLES31 module."

* commit 'a35f7389107fa54395137ff631c08551cff6eb05':
  Fix -Wconversion warnings in GLES31 module.