diff options
| author | Chung-yih Wang <cywang@google.com> | 2010-08-10 21:54:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-10 21:54:01 -0700 |
| commit | 11d4c629b3c39761b8b9f38722011af5221867db (patch) | |
| tree | 350f06ee295c61fdb5b3f03049e08141652295bd /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 2d1fef34b5a41e775bf0154a0b850d922d48976c (diff) | |
| parent | 9c47e70d760eaa2d24fa5b3dcaf0b87fb0105ccb (diff) | |
am 2c9de2b9: am f57324cf: Add getSipUri() for identification.
Merge commit '2c9de2b9e5568c8918b36866d3cf20833a8c20e1'
* commit '2c9de2b9e5568c8918b36866d3cf20833a8c20e1':
Add getSipUri() for identification.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions