diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-30 13:36:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-30 13:36:37 -0700 |
| commit | 974204a35ca8712548598e04216c896672e2870a (patch) | |
| tree | 6948868fce1e6ea9301a77e49d9880f8df2e7449 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 035a3a1524d7f73b09c59603bd66e338b543b82f (diff) | |
| parent | eced15c440a8d3d71c6be37ee45a83b02821acf8 (diff) | |
am c79e74ec: am d29e0754: Merge "Add uri field to SipManager.ListenerRelay" into gingerbread
Merge commit 'c79e74ec1d30f95de89568ee645a9b1577ae73b3'
* commit 'c79e74ec1d30f95de89568ee645a9b1577ae73b3':
Add uri field to SipManager.ListenerRelay
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions