am b0f812a1: (-s ours) am dafc0617: Remove negative tests for sliced 3D ASTC texture...
authorPyry Haulos <phaulos@google.com>
Mon, 11 Jan 2016 19:51:07 +0000 (19:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:51:07 +0000 (19:51 +0000)
am: be8004d793

* commit 'be8004d793c616012bc3579b73abfdbfad09ffb8':


Trivial merge