am 33d5322f: Merge "Remove infeasible gles2 matrix tests." into mnc-dev am: a1967259d...
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: ce8938f107

* commit 'ce8938f1070af3be99de97c212e0863862524f97':


Trivial merge