diff options
| author | Grace Kloba <klobag@google.com> | 2010-04-19 16:19:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-19 16:19:30 -0700 |
| commit | 6aa3b38ef3d934f0540f44d8b3b1c27f47f8dbc0 (patch) | |
| tree | c5a922a844ec13a0a5c16c639ae0c309be17e8cd /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b8b2a1336f24d7f41ff635bee9422a0ac45f8564 (diff) | |
| parent | 04b287b9ff92503a1924c0ec58f0312b4b517741 (diff) | |
am 8831d4dc: am 8f655cb6: Merge "Update the comment which supposed to be checked in in the last CL." into froyo
Merge commit '8831d4dc5545cde841a0ef318b0ec870acfa0e45' into kraken
* commit '8831d4dc5545cde841a0ef318b0ec870acfa0e45':
Update the comment which supposed to be checked in
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions