| commit | fa6eda01a9f3df0102ce6a65302c8674cc9c7e50 | [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 | a0c1b31bd8e162132c54a2ef8521b3ed6cf8cad1 | |
| parent | d504605919a62902e10cd13536390ffce84a3326 [diff] | |
| parent | 072868a4d33740ee023b7364dcb38f4fc14bd8b0 [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