diff options
| author | Chung-yih Wang <cywang@google.com> | 2010-08-10 20:47:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-10 20:47:18 -0700 |
| commit | 9c47e70d760eaa2d24fa5b3dcaf0b87fb0105ccb (patch) | |
| tree | 1e3818e4a7e8c121b443ebecd3a7f11586fa50e7 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 0879f1cafa7d4cfd9d82e3254c61045177846cd7 (diff) | |
| parent | 44582306d2c3d89a5e25c85cddbd15e5d5b61e6e (diff) | |
am f57324cf: Add getSipUri() for identification.
Merge commit 'f57324cf4f82947296f4d1acb9df1f3c9c03134e' into gingerbread-plus-aosp
* commit 'f57324cf4f82947296f4d1acb9df1f3c9c03134e':
Add getSipUri() for identification.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions