OSDN Git Service

am a6fb375c: am 056340ac: Merge "stubs"
authorJean-Baptiste Queru <jbq@google.com>
Mon, 31 Jan 2011 20:03:59 +0000 (12:03 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 31 Jan 2011 20:03:59 +0000 (12:03 -0800)
commit9d0925821778bd4f91d1c5eb187bb9a62fc84891
tree12a552a7b5527f5337adab29948ca5123dfbece3
parentf12dfd3406889e7ed41aa775d97c3d187b540732
parentc85d73119ce142ffdce405f4bd54f71e577ed3c2
am a6fb375c: am 056340ac: Merge "stubs"

* commit 'a6fb375cf727b6ded057110875fe49a9b3f230a3':
  stubs
opengl/libs/EGL/egl.cpp