am a634b26d: am 8e4180aa: (-s ours) am 33d5322f: Merge "Remove infeasible gles2 matri...
authorKalle Raita <kraita@google.com>
Thu, 27 Aug 2015 14:47:05 +0000 (14:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:47:05 +0000 (14:47 +0000)
* commit 'a634b26d4ed0e9898b854b1063f8103c03f8f351':


Trivial merge