diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-28 10:56:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 10:56:34 -0700 |
| commit | ceac44e1043f8021f30a01197b267fd2980a2527 (patch) | |
| tree | 355bbde30004c085072c85fa7f9e54c1710673b1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a0d19f9674b1c41ef151bbc0fe2a2272ee6f489a (diff) | |
| parent | 1f9798de77d34a64e6bae312a6c1448a35d2aaf6 (diff) | |
am 1738252a: am 32346522: Merge "Don\'t enter DISCONNECTING state when the call/connection is not alive" into gingerbread
Merge commit '1738252a596c71851cabf5835acb3584ad6b3191'
* commit '1738252a596c71851cabf5835acb3584ad6b3191':
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