am b102dadf: am f307a4a0: Merge "Check that HDR version of ASTC is present for non...
authorKalle Raita <kraita@google.com>
Wed, 6 May 2015 00:45:05 +0000 (00:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 6 May 2015 00:45:05 +0000 (00:45 +0000)
* commit 'b102dadfe7d94d4268c730d93bd0b650b133cc83':
  Check that HDR version of ASTC is present for non-2D texture targets.


Trivial merge