am 42d036f7: am 55d9f833: Remove two EGL tests with flaky results
authorKalle Raita <kraita@google.com>
Thu, 13 Aug 2015 00:33:26 +0000 (00:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Aug 2015 00:33:26 +0000 (00:33 +0000)
* commit '42d036f7a3a5aa41e0fd09e3866f309b31a50b1e':
  Remove two EGL tests with flaky results


Trivial merge