OSDN Git Service

am 03691218: am e5f7bf74: am b6c21004: Merge "Implement per-display EGLConfig and...
authorJesse Hall <jessehall@google.com>
Fri, 3 Jan 2014 18:36:29 +0000 (18:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 3 Jan 2014 18:36:29 +0000 (18:36 +0000)
commit524672571f1df138eb913e672aaa74e0257aa8c0
tree707b2b97aa08d69cab290a19753aafa85326b1d2
parent10ca42cbdc75c6a36d0b72dadbe845d990e31e95
parent03691218ada2fb7e084ad4ae7ddd54f9b28d5611
am 03691218: am e5f7bf74: am b6c21004: Merge "Implement per-display EGLConfig and configless EGLContext"

* commit '03691218ada2fb7e084ad4ae7ddd54f9b28d5611':
  Implement per-display EGLConfig and configless EGLContext
services/surfaceflinger/DisplayHardware/HWComposer.cpp
services/surfaceflinger/SurfaceFlinger.cpp