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:31:24 +0000 (19:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:31:24 +0000 (19:31 +0000)
am: b102dadfe7

* commit 'b102dadfe7d94d4268c730d93bd0b650b133cc83':


Trivial merge