diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-10-19 23:03:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-19 23:03:25 -0700 |
| commit | c1820600b30fac54f918b9e2dd76ab2ef403ae8a (patch) | |
| tree | f5b1799976c978d04a73b8897d6b2152e23a020a /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 309be7131f8a969fb3715665fba389f0ac9f3852 (diff) | |
| parent | 89b8c939c424258f489201c5561d778698636e01 (diff) | |
am b595e094: Merge "Return display name in SipConnection.getCnapName()." into gingerbread
Merge commit 'b595e094e3901ff8a224eaf7d4869e7d2e5649dd' into gingerbread-plus-aosp
* commit 'b595e094e3901ff8a224eaf7d4869e7d2e5649dd':
Return display name in SipConnection.getCnapName().
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions