am a9b2fd7c: Merge "Fix -Wconversion warnings in GLES3 stress module."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 22 May 2015 20:02:44 +0000 (20:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 May 2015 20:02:44 +0000 (20:02 +0000)
* commit 'a9b2fd7c0fe45eebb45862680d1395910ebc4df8':
  Fix -Wconversion warnings in GLES3 stress module.


Trivial merge