diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-27 19:26:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-27 19:26:11 -0700 |
| commit | 1f9798de77d34a64e6bae312a6c1448a35d2aaf6 (patch) | |
| tree | f1f0e7831502036b3e854a76778f8c6ae8d6def6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 0bf2a8bd671c524037d7d559b12005df542af1ff (diff) | |
| parent | 813ccddc02b0868bed408074d25a5be49d37725d (diff) | |
am 32346522: Merge "Don\'t enter DISCONNECTING state when the call/connection is not alive" into gingerbread
Merge commit '3234652242f54e3366e7c74e5a0cf0a7da5871b4' into gingerbread-plus-aosp
* commit '3234652242f54e3366e7c74e5a0cf0a7da5871b4':
Don't enter DISCONNECTING state when the call/connection is not alive
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions