OSDN Git Service

am f58475b5: am 60393d45: Merge "Add runtime debugging capabilities to OpenGL" into...
authorRomain Guy <romainguy@google.com>
Fri, 19 Oct 2012 00:39:13 +0000 (17:39 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Oct 2012 00:39:13 +0000 (17:39 -0700)
* commit 'f58475b5ae4ccb3a31c05c79da8b2914c62a3510':
  Add runtime debugging capabilities to OpenGL

1  2 
opengl/libs/EGL/egl.cpp

Simple merge