diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-08-24 16:58:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 16:58:05 -0700 |
| commit | 7d95b2f46ced1e2cb37a25b2f3e27e7fa9b15bcc (patch) | |
| tree | 9535013ef46bc8c2bb119e23ead0c28f5b894a94 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 397046641cd8f6da5c04ea161549d46e71cd923e (diff) | |
| parent | 19455eece877a2f64d7b8eb7ddc62a1a3e58ac51 (diff) | |
am ff547a59: (-s ours) am 88bff62c: Merge "Fix vCard so that it looks at IM correctly." into gingerbread
Merge commit 'ff547a59494206a1555eafa296b68961b677ba90'
* commit 'ff547a59494206a1555eafa296b68961b677ba90':
Fix vCard so that it looks at IM correctly.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions