diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2010-09-02 08:17:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-02 08:17:11 -0700 |
| commit | d764bb7a4b3d7841dbe860818444bfc4d35742a1 (patch) | |
| tree | 5a438d33fa40180d101fc1ad648ae2e7d3acbe3c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 851a46069d368479264daf3f9f88c7304536b505 (diff) | |
| parent | d4d7550d2260bbe713c57056eec907cdeec24798 (diff) | |
am dc296b0d: Merge "SipService: reduce the usage of javax.sdp.*." into gingerbread
Merge commit 'dc296b0d4bd6fef8764c10fb4cd59c85bc5186f6' into gingerbread-plus-aosp
* commit 'dc296b0d4bd6fef8764c10fb4cd59c85bc5186f6':
SipService: reduce the usage of javax.sdp.*.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions