am f307a4a0: Merge "Check that HDR version of ASTC is present for non-2D texture...
authorKalle Raita <kraita@google.com>
Tue, 5 May 2015 23:54:41 +0000 (23:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 5 May 2015 23:54:41 +0000 (23:54 +0000)
* commit 'f307a4a08375f02c56fb6ea0215018a798971862':
  Check that HDR version of ASTC is present for non-2D texture targets.


Trivial merge