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

* commit '736584229f08478c6caf53d4cc572bf09d59d9c9':


Trivial merge