diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-08-24 18:59:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 18:59:00 -0700 |
| commit | acf08e370ed80341a29a8007ebfa6268fb2d270b (patch) | |
| tree | 3d7a6ea3e640e88684325b18b52731badb53d295 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 938f7fdcb8845cbbd79d499c1aa30c1c57630039 (diff) | |
| parent | b4b73968bc271271d1529ca77344f0f2d63955b1 (diff) | |
am 1922ac10: (-s ours) am d0ad67ad: Merge "Fix the test breakage in vCard tests." into gingerbread
Merge commit '1922ac108ce6fd12f640b2892aa1eb348911a94b'
* commit '1922ac108ce6fd12f640b2892aa1eb348911a94b':
Fix the test breakage in vCard tests.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions