commit 6d8b948feb74f4d54dab7e789cd3eb87421ffa54
author David 'Digit' Turner <digit@google.com> Tue Mar 24 11:48:01 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Mar 24 11:48:01 2015 +0000
tree 4feedad8740262b75b685c63a5609d5ae9902c19
parent 8f684463a8f30c8c119932d5faabd478f4f75abb
parent f3c80223ec0ba1083ad419a63731a2fed6d34733

Merge changes I8d94d7a3,I3c7945c3,Ia4d351be,I9a7790d6,I5ad66fbd, ... into studio-1.3-dev
automerge: f3c8022

* commit 'f3c80223ec0ba1083ad419a63731a2fed6d34733':
  emugl: Switch {create,destroy}OpenGLSubwindow() to return bool.
  emugl: EglOsApi.h: Remove EglConfig.h dependency.
  emugl: EglOSApi.h: Introduce EglOS::Engine interface.
  emugl: Remove EGLNativePixelFormat.
  emugl: Get rid of EGLNativeContextType
  emugl: Remove EGLNativePbufferType
  emugl: Get rid of EGLNativeSurfaceType.
  emugl: Remove EGLNativeInternalDisplayType.
  emugl: EglOsApi.h: Get rid of EGLNativeInternalDisplayType wrappers.
  emugl: EglOsApi_darwin.cpp: Implement EglOS::Display sub-class.
  emugl: EglOsApi_wgl.cpp: Implement EglOS::Display instance.
  emugl: EglOsApi.h: Implement GLX-based Display class.
  emugl: EglOsApi.h: Add Display interface class.
  emugl: EglOsApi_xxx.cpp: Minor cleanup and reformatting.
  emugl: eglinternalplatform.h: Move and rename to EglInternal.h
  emugl: EglDisplay: remove m_isDefault member.
  emugl: EglOsApi.h: Rename implementation sources.
  emugl: EglOsApi.h: Remove EglSurface.h include.
  emugl: EglOsApi.h: Remove EglPbufferSurface.h include.
  emugl: EglOsApi.h: Remove EglDisplay.h include.