| commit | 7be3e5d2d8101a8f5e12bbdf650431a734f88eba | [log] [tgz] |
|---|---|---|
| author | Mathias Agopian <mathias@google.com> | Thu Apr 30 14:43:18 2009 -0700 |
| committer | Mathias Agopian <mathias@google.com> | Thu Apr 30 14:43:18 2009 -0700 |
| tree | d45d998a3a085ce95bc632095edd0f468391f0e7 | |
| parent | 18829d11aae5035b439dce157dca8867a0777d7a [diff] | |
| parent | fb5982967eddeb19a2e6454961e37a32e0e1b986 [diff] |
Merge commit 'goog/master' into merge_master Conflicts: libs/surfaceflinger/Layer.cpp libs/surfaceflinger/SurfaceFlinger.cpp opengl/libagl/egl.cpp opengl/libs/EGL/egl.cpp opengl/libs/GLES_CM/gl.cpp opengl/libs/GLES_CM/gl_api.in opengl/libs/gl_entries.in opengl/libs/tools/glapigen