diff options
| author | Chung-yih Wang <cywang@google.com> | 2010-08-05 21:11:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-05 21:11:09 -0700 |
| commit | 544727a476524f043e7c18be480a4d0a4a1777b8 (patch) | |
| tree | 6d8db2ea573a837bf75850982e102a4d232851df /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c92d9221e4811e02b2b4260fb25b0d3ef372c74b (diff) | |
| parent | bce20fffeffcdc486c25836b5fa21134096ff414 (diff) | |
am e7b92260: am b9605886: Merge "Revert "Revert "Move SIP telephony related codes to framework.""" into gingerbread
Merge commit 'e7b92260e228039295874bea024b629cb5a4d89a'
* commit 'e7b92260e228039295874bea024b629cb5a4d89a':
Revert "Revert "Move SIP telephony related codes to framework.""
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions