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


Trivial merge