diff options
| author | Grace Kloba <klobag@google.com> | 2010-04-16 16:40:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-16 16:40:54 -0700 |
| commit | 1d75e33362e254d2e2a444c1bc6b9c012600dd68 (patch) | |
| tree | c5a922a844ec13a0a5c16c639ae0c309be17e8cd /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1c63d5fb71ef2ccfd52ca49ebf1924d9fef883f8 (diff) | |
| parent | b087fe8427b9765ccecf5b8a1c94d7cbe989d751 (diff) | |
am 17e36d23: am 3c44db3f: Merge "Missed a case to resumeUpdatePicture." into froyo
Merge commit '17e36d233dff7178e60d841a650d9bef5d0af93c' into kraken
* commit '17e36d233dff7178e60d841a650d9bef5d0af93c':
Missed a case to resumeUpdatePicture.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions