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


Trivial merge