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

* commit '2468cb837543bf056f2ba8b3020cae293029153d':


Trivial merge