resolve merge conflicts of 9ea5295597 to master.

Change-Id: I68b883e8a1bb17abd4cf151d057dd07e53a80f50

diff --cc libs/hwui/renderthread/EglManager.cpp
index 805bec1,902264e..364d4dd
--- 1/libs/hwui/renderthread/EglManager.cpp
--- 2/libs/hwui/renderthread/EglManager.cpp
+++ b/libs/hwui/renderthread/EglManager.cpp
@@@ -344,8 -295,7 +344,8 @@@ bool EglManager::swapBuffers(const Fram
          // For some reason our surface was destroyed out from under us
          // This really shouldn't happen, but if it does we can recover easily
          // by just not trying to use the surface anymore
-         ALOGW("swapBuffers encountered EGL_BAD_SURFACE on %p, halting rendering...",
-                 frame.mSurface);
 -        ALOGW("swapBuffers encountered EGL error %d on %p, halting rendering...", err, surface);
++        ALOGW("swapBuffers encountered EGL error %d on %p, halting rendering...",
++                err, frame.mSurface);
          return false;
      }
      LOG_ALWAYS_FATAL("Encountered EGL error %d %s during rendering",