| commit | 2af30c2b584e931bf444d7daed43a01d6a585df6 | [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 | f3f49f7a9b018078cc765642abc215dea8a8aaf8 | |
| parent | 4fde27f0b89b3df5e280b648dd6c7968ee864916 [diff] | |
| parent | eac4d8216b8e26ca18b4c56f105f68595e5c410f [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