diff options
| author | Vasu Nori <vnori@google.com> | 2010-07-17 18:31:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-17 18:31:28 -0700 |
| commit | 450560cf0d1b7e0c9e47df9e2b515d86cf9d44cd (patch) | |
| tree | 6c5e8d329134a56c5ff40a87a3ecf1325a0720b0 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 54bcb68417c4139c49c0826ec167c59b2811a8dc (diff) | |
| parent | f6164eded59b9ddd59a1595886b7963c0a7bf712 (diff) | |
am bbc2b4e6: am 5b31498b: add video/audio chat-compatibility modes to ContactsContract
Merge commit 'bbc2b4e69a1788987a8fe959cc0105290b431283'
* commit 'bbc2b4e69a1788987a8fe959cc0105290b431283':
add video/audio chat-compatibility modes to ContactsContract
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions