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


Trivial merge