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


Trivial merge