| commit | d717598616910b5454b56429dec3bfad2757bd52 | [log] [tgz] |
|---|---|---|
| author | Mathias Agopian <mathias@google.com> | Thu May 14 22:44:23 2009 -0700 |
| committer | Mathias Agopian <mathias@google.com> | Thu May 14 22:44:23 2009 -0700 |
| tree | c2271b0f7e475c4ac1cf520bcecd6f35e002d99a | |
| parent | 5958661507b39cd59e68e9bc2b54399af92847c4 [diff] | |
| parent | 757a434f81895ddcad2481a5912ff1eb0de8a0d6 [diff] |
Merge commit 'goog/master' into merge_master Conflicts: opengl/libagl/Android.mk opengl/libs/Android.mk opengl/libs/egl_impl.h