diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-28 13:02:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 13:02:55 -0700 |
| commit | 24bf6aa6175c3a657799b5f9db80d644267fd56a (patch) | |
| tree | e3fe56f3a9a380af64cd06de2c2cab32a08165a0 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 2121f3cd04b18041e004e2003488703ef9245afe (diff) | |
| parent | ce6a06d54ef8ae5f1116260a1b01ee6fa93ddf6f (diff) | |
am 6d028dd2: Merge "SIP: Feedback any provisional responses in addition to RING" into gingerbread
Merge commit '6d028dd2f102a6eafaa2edebeb55f55b4c32fc42' into gingerbread-plus-aosp
* commit '6d028dd2f102a6eafaa2edebeb55f55b4c32fc42':
SIP: Feedback any provisional responses in addition to RING
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions