diff options
| author | Chet Haase <chet@google.com> | 2010-09-15 19:09:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 19:09:59 -0700 |
| commit | 97dd453ae5e8ec6b6e79c20adb187f4de87fc0f8 (patch) | |
| tree | 247e2d025033d62db7eece1eb089109dd36e382f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e360c2aedbeb27101c00b4b9d1a8a6b0c975c4ed (diff) | |
| parent | 7c10d94225ee3a03711c6310b192d3b2425cf85b (diff) | |
am 5ae52f68: (-s ours) am 8f385aff: Merge "Add new/changed drawable assets from design team" into gingerbread
Merge commit '5ae52f68cfda6629ab55de313ec5e45f34f8a267'
* commit '5ae52f68cfda6629ab55de313ec5e45f34f8a267':
Add new/changed drawable assets from design team
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions