diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-15 07:08:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 07:08:38 -0700 |
| commit | d0def4800f22618fbd7ac356cfc8748512f85f3f (patch) | |
| tree | 1e7afed8ff0231c6b168062fa8f04396d6eb7f2f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 39f77068e79fa24d26f73cf8e4a6c6f324cf9cc4 (diff) | |
| parent | fed3a15b282e72ed2748de476919aad6c6c7f9cc (diff) | |
am 188a8f1b: am 89a7180a: Merge "SipService: ignore connect event for non-active networks." into gingerbread
Merge commit '188a8f1b72452bc294daa2186e93771543be0478'
* commit '188a8f1b72452bc294daa2186e93771543be0478':
SipService: ignore connect event for non-active networks.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions