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)
commit44e61779f6b10b338a8771608ac5b382dc184e0c
tree677ffe1c1e958572346e9bd19b86d930725ba44a
parentc1b0d953c98026b24089591878e534e7bcc717db
parentd6451d14ae9147499720ac60caabb8aac227e4be
am d6451d14: Merge "Fix -Wconversion warnings in multisample tests."

* commit 'd6451d14ae9147499720ac60caabb8aac227e4be':
  Fix -Wconversion warnings in multisample tests.