diff options
| author | David Brown <dab@google.com> | 2010-10-10 16:44:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-10 16:44:01 -0700 |
| commit | 418378482b45caff99834da5887deb5f395a5cd5 (patch) | |
| tree | ad74275b0da46e9af42f696d14416cad3e96cb8b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5e7a919b3f04f96e0b9b83de9f687e3d23e5601d (diff) | |
| parent | 29a4f07b7ebe01d504dde904de02807093c787af (diff) | |
am d07833f5: Don\'t manually create CallerInfo objects from SipPhone
Merge commit 'd07833f54b6e8e361b666ae16efa15fdf60159de' into gingerbread-plus-aosp
* commit 'd07833f54b6e8e361b666ae16efa15fdf60159de':
Don't manually create CallerInfo objects from SipPhone
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions