am 95915520: Merge "Fix -Wconversion warnings in GLES2 stress module."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 22 May 2015 19:55:49 +0000 (19:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 May 2015 19:55:49 +0000 (19:55 +0000)
* commit '959155207871014a66716720eb12a1aeebefdfdc':
  Fix -Wconversion warnings in GLES2 stress module.


Trivial merge