diff options
| author | Vasu Nori <vnori@google.com> | 2010-07-17 18:25:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-17 18:25:20 -0700 |
| commit | f6164eded59b9ddd59a1595886b7963c0a7bf712 (patch) | |
| tree | 84f9ae1e55b173a9692d2868c7d1a956b7c47de9 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c9c41edd92c016848f03099e4c24d27f4ff805a2 (diff) | |
| parent | f26db0d6c55ff572f8772498c5d845ade7c6e8b8 (diff) | |
am 5b31498b: add video/audio chat-compatibility modes to ContactsContract
Merge commit '5b31498ba1f9874f395d80152304512fa4c0144d' into gingerbread-plus-aosp
* commit '5b31498ba1f9874f395d80152304512fa4c0144d':
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