tree 44a7b3ac6ce6235065eabfc6e05cde745ad39482
parent 42ae84dd289dda8e48d6a22eb1d14f37df0d50e1
parent 9473093ac845670359d70797577b04da3a6ed15a
author Mike Stroyan <stroyan@google.com> 1494425851 +0000
committer android-build-merger <android-build-merger@google.com> 1494425851 +0000

Merge "egl: recover from failed eglMakeCurrent" into oc-dev am: 35c63d456a
am: 9473093ac8

Change-Id: If0865ff627694736f2a242d96e13fe16d8ee461f