am d7095d5d: am 11514f5f: am 9c37338a: (-s ours) am 55d9f833: Remove two EGL tests...
authorKalle Raita <kraita@google.com>
Thu, 27 Aug 2015 21:00:17 +0000 (21:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 21:00:17 +0000 (21:00 +0000)
* commit 'd7095d5df1c7214e289bd03d83f78a6a450589d8':


Trivial merge