am 535a5b11: Merge "Fix -Wconversion warnings in GLES3 performance module."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 22 May 2015 19:55:54 +0000 (19:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 May 2015 19:55:54 +0000 (19:55 +0000)
* commit '535a5b11259dbcdcdf80142cb78abc5baa872b8f':
  Fix -Wconversion warnings in GLES3 performance module.


Trivial merge