am 5751c6dc: am a634b26d: am 8e4180aa: (-s ours) am 33d5322f: Merge "Remove infeasibl...
authorKalle Raita <kraita@google.com>
Thu, 27 Aug 2015 21:00:16 +0000 (21:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 21:00:16 +0000 (21:00 +0000)
commit1699d2ba33a1ae26cfae38b17f727e1eee9e98cc
tree69eb8d3e14741b2fff2fa8ca752c3a6da5d3941c
parent433ca0d0f281a755b12665e3da8316d6c4bb4120
parent5751c6dc33081f0f8783ee7c9dfcab734570715f
am 5751c6dc: am a634b26d: am 8e4180aa: (-s ours) am 33d5322f: Merge "Remove infeasible gles2 matrix tests." into mnc-dev

* commit '5751c6dc33081f0f8783ee7c9dfcab734570715f':