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

* commit 'e7ac113b8be78dc7d4652408b383ee18a7de601f':


Trivial merge