am a3c2a0f7: am ab63de16: Merge "Negative API tests against non-2D texture targets...
authorKalle Raita <kraita@google.com>
Fri, 15 May 2015 21:15:14 +0000 (21:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 May 2015 21:15:14 +0000 (21:15 +0000)
* commit 'a3c2a0f7110eca54aab857c9e437675f57360367':
  Negative API tests against non-2D texture targets with LDR ASTC.


Trivial merge