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)
commita1e74f891813ad0bac2daa433dfe2bcc5603a0e1
tree9bfdfc0c98bea00dcbb1f18c9f4b3ba35ad26dde
parent34c3ee2f7718e6a5307a8f0f5fade09da79c1894
parent535a5b11259dbcdcdf80142cb78abc5baa872b8f
am 535a5b11: Merge "Fix -Wconversion warnings in GLES3 performance module."

* commit '535a5b11259dbcdcdf80142cb78abc5baa872b8f':
  Fix -Wconversion warnings in GLES3 performance module.