am a2c86423: Merge "Fix -Wconversion warnings in XFB tests."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 22 May 2015 20:02:43 +0000 (20:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 May 2015 20:02:43 +0000 (20:02 +0000)
* commit 'a2c86423ee7490a847c327cd75b050c413ebdee2':
  Fix -Wconversion warnings in XFB tests.


Trivial merge