diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-10-21 10:53:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-21 10:53:49 -0700 |
| commit | 10e8c91316d6510b36e2b3a7be2a7e1b7f7f92c8 (patch) | |
| tree | 098417931546946efcd3ae0cd964b2d743dc5d89 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 41e5645b1a9f416f926c7f2aa024ed0bef206076 (diff) | |
| parent | c1820600b30fac54f918b9e2dd76ab2ef403ae8a (diff) | |
am e894ff7a: am b595e094: Merge "Return display name in SipConnection.getCnapName()." into gingerbread
Merge commit 'e894ff7a7693fdc406b4f4b28cfd1d9d7d966b38'
* commit 'e894ff7a7693fdc406b4f4b28cfd1d9d7d966b38':
Return display name in SipConnection.getCnapName().
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions