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)
commit88b1dbc9f0d1ff6454c10a3b7f7f163fe21e95dd
treea029f1a0953e4071f4eaeadfe8f6f7637ec8f940
parent3d5e5cf1b45974034c6a42e53051cda7d825eb8b
parenta3c2a0f7110eca54aab857c9e437675f57360367
am a3c2a0f7: am ab63de16: Merge "Negative API tests against non-2D texture targets with LDR ASTC." into mnc-dev

* commit 'a3c2a0f7110eca54aab857c9e437675f57360367':
  Negative API tests against non-2D texture targets with LDR ASTC.