am f307a4a0: Merge "Check that HDR version of ASTC is present for non-2D texture...
authorKalle Raita <kraita@google.com>
Mon, 11 Jan 2016 19:34:58 +0000 (19:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:34:58 +0000 (19:34 +0000)
am: f585e95d78

* commit 'f585e95d78291f45fb5aa246960e2452c121f811':


Trivial merge