diff options
| author | repo sync . build/envsetup.sh lunch passion-en <clchen@google.com> | 2010-09-28 09:30:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 09:30:16 -0700 |
| commit | a82ade0bad1f452e19ae651bd34b15d39e15eb40 (patch) | |
| tree | 355bbde30004c085072c85fa7f9e54c1710673b1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 76b0ed516a1d4ca806cd5fb5556d36b54c107e41 (diff) | |
| parent | 0bf2a8bd671c524037d7d559b12005df542af1ff (diff) | |
am 8c665807: (-s ours) am 4fc3d2f0: DO NOT MERGE
Merge commit '8c66580759b3085866e1f9f1ca9af1a60220e574'
* commit '8c66580759b3085866e1f9f1ca9af1a60220e574':
DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions