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)
* commit 'a35f7389107fa54395137ff631c08551cff6eb05':
  Fix -Wconversion warnings in GLES31 module.


Trivial merge