diff options
| author | David Brown <dab@google.com> | 2010-09-30 11:25:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-30 11:25:54 -0700 |
| commit | 375607dee441cf52215e8a8bb7e7a685037e0720 (patch) | |
| tree | 6948868fce1e6ea9301a77e49d9880f8df2e7449 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 062d7751539238e708ce963d8da7320e5f5b8b0f (diff) | |
| parent | eeb9a9af5cce7d481ef7ec530dcfc19998994bfb (diff) | |
am 5cf44f69: am 87fbcc2b: Merge "Implement contacts lookup (caller-id) for incoming SIP calls." into gingerbread
Merge commit '5cf44f6907cde1126dd982af2d4dfd5c35da9eb9'
* commit '5cf44f6907cde1126dd982af2d4dfd5c35da9eb9':
Implement contacts lookup (caller-id) for incoming SIP calls.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions