am 6d84d9ec: Fix unrelated errors in ASTC negative API tests
authorKalle Raita <kraita@google.com>
Mon, 11 Jan 2016 19:38:45 +0000 (19:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:38:45 +0000 (19:38 +0000)
am: 466ee0e8d7

* commit '466ee0e8d7e602b9ca6c634a2fa871f022170d55':


Trivial merge