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


Trivial merge