diff options
| author | Chet Haase <chet@google.com> | 2010-09-15 15:36:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 15:36:58 -0700 |
| commit | 7c10d94225ee3a03711c6310b192d3b2425cf85b (patch) | |
| tree | 14932a87458bbc9f1488a977ea1a1a31539b22af /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f54200e66c3e5076e0a1c62861c8812c185eea3c (diff) | |
| parent | a295cadc65067831a817b7bcde742622323d6bb1 (diff) | |
am 8f385aff: Merge "Add new/changed drawable assets from design team" into gingerbread
Merge commit '8f385affafddc1147b9dc4f0c4f49449ebf477c9' into gingerbread-plus-aosp
* commit '8f385affafddc1147b9dc4f0c4f49449ebf477c9':
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