am ab63de16: Merge "Negative API tests against non-2D texture targets with LDR ASTC...
authorKalle Raita <kraita@google.com>
Mon, 11 Jan 2016 19:33:58 +0000 (19:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:33:58 +0000 (19:33 +0000)
am: a3c2a0f711

* commit 'a3c2a0f7110eca54aab857c9e437675f57360367':


Trivial merge