am 2fc57cfd: Merge "Fix -Wconversion warnings in fbo tests."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 22 May 2015 19:55:53 +0000 (19:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 May 2015 19:55:53 +0000 (19:55 +0000)
* commit '2fc57cfd169e84d1e4958b9bbc933d36f5d25631':
  Fix -Wconversion warnings in fbo tests.


Trivial merge