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

* commit 'c3a7c41872588a7695f95672733465e114cec01a':


Trivial merge