diff options
| author | David Brown <dab@google.com> | 2010-09-29 14:10:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-29 14:10:37 -0700 |
| commit | eeb9a9af5cce7d481ef7ec530dcfc19998994bfb (patch) | |
| tree | 98c2aa54138fd908e08466ccfb8567ddb09e10bf /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 16f1ddba0f18c7a5758a587cd6e1470125fdca09 (diff) | |
| parent | b3df9fdb39a983dc1f7dd936e10c5eba482dcecb (diff) | |
am 87fbcc2b: Merge "Implement contacts lookup (caller-id) for incoming SIP calls." into gingerbread
Merge commit '87fbcc2b73b9b92d50c4520053bfc7bdff4cd91b' into gingerbread-plus-aosp
* commit '87fbcc2b73b9b92d50c4520053bfc7bdff4cd91b':
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