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

* commit '3beb6dc5bae042a6dc19ed08b83274d7a7959fa7':


Trivial merge