Merge "Fix -Wconversion warnings in GLES31 module."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 22 May 2015 00:41:08 +0000 (00:41 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 22 May 2015 00:41:09 +0000 (00:41 +0000)

Trivial merge