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

* commit '72813b0f27413bd0b1f8f34e17ed6cc6e35e318d':


Trivial merge