diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-08-18 14:08:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-18 14:08:03 -0700 |
| commit | 6f8522b565006db46017424b963d2c7b4ff9bd50 (patch) | |
| tree | de30c854a07ca8eb3eb435e8437fb70e2c3d5dc3 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 2f58d37a22caf78c79f727b6357f465e95d14b93 (diff) | |
| parent | b6f7f8f4b2a9d4edd9f6677d1b1d3f72c3088373 (diff) | |
am a7bb3ba5: (-s ours) am f996ed9f: Merge "Make vCard importer/exporter aware of multi-byte parameters." into gingerbread
Merge commit 'a7bb3ba54aed70919c8304ae4227ab5106243f75'
* commit 'a7bb3ba54aed70919c8304ae4227ab5106243f75':
Make vCard importer/exporter aware of multi-byte parameters.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions