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

* commit '9c8911da7ceb765f7badb407634a35db8d986dd1':


Trivial merge