am 8e4180aa: (-s ours) am 33d5322f: Merge "Remove infeasible gles2 matrix tests....
authorKalle Raita <kraita@google.com>
Mon, 11 Jan 2016 19:48:20 +0000 (19:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:48:20 +0000 (19:48 +0000)
am: a634b26d4e

* commit 'a634b26d4ed0e9898b854b1063f8103c03f8f351':


Trivial merge