diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-15 07:07:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 07:07:56 -0700 |
| commit | 3d4315b7f1f211cee771af6d58677582b202cc86 (patch) | |
| tree | 1e7afed8ff0231c6b168062fa8f04396d6eb7f2f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 86fd95efc4c90b2de07ecd300f3255b09ebcbff4 (diff) | |
| parent | 77d35e00bc43c4b1f45b44f000f99bfb2ba40c12 (diff) | |
am 3692af92: am 99bf4e45: SIP: remove dependency on javax.sip
Merge commit '3692af92ab290a561a927079cbf1f778f57fe5f9'
* commit '3692af92ab290a561a927079cbf1f778f57fe5f9':
SIP: remove dependency on javax.sip
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions
