am 11514f5f: am 9c37338a: (-s ours) am 55d9f833: Remove two EGL tests with flaky...
authorKalle Raita <kraita@google.com>
Thu, 27 Aug 2015 14:47:06 +0000 (14:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:47:06 +0000 (14:47 +0000)
* commit '11514f5fe75eabcf652614a47353c8dcfa185499':


Trivial merge