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

* commit 'b541f7d4a4ca368988666b1a7828e86b26c8a4fc':


Trivial merge