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)
commit27425afdbf484e40c5cd507079ffda557f8defae
treec2a1f5964b229b4b5225b05ebeb14891a7b7be34
parent0e14640e5a3fe58f244fab2e5c750c1ce2e586fe
parentf362f37fa194684bfb653ff6c5b7dec85fd05518
am f362f37f: Merge "Fix -Wconversion warnings in GLES2 performance module."

* commit 'f362f37fa194684bfb653ff6c5b7dec85fd05518':
  Fix -Wconversion warnings in GLES2 performance module.