am 9c37338a: (-s ours) am 55d9f833: Remove two EGL tests with flaky results
authorKalle Raita <kraita@google.com>
Mon, 11 Jan 2016 19:48:33 +0000 (19:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:48:33 +0000 (19:48 +0000)
am: 11514f5fe7

* commit '11514f5fe75eabcf652614a47353c8dcfa185499':


Trivial merge