am 1c3a4b06: Fix EGL multithread single window tests. am: e5870a1218
authorMika Isojärvi <misojarvi@google.com>
Mon, 11 Jan 2016 19:36:45 +0000 (19:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:36:45 +0000 (19:36 +0000)
am: 97ab61b65a

* commit '97ab61b65a0d7a95c31298178c41e2b1824734a1':


Trivial merge