diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-14 10:00:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-14 10:00:14 -0700 |
| commit | fed3a15b282e72ed2748de476919aad6c6c7f9cc (patch) | |
| tree | 1664382aa17eb82db6f397d535fff7bd57ac2055 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1ed654740cf0c775458efa7c7cec19083fa3d316 (diff) | |
| parent | 946dc2946e8e1401397e2880a28a432afa76ffa6 (diff) | |
am 89a7180a: Merge "SipService: ignore connect event for non-active networks." into gingerbread
Merge commit '89a7180a242043a0b4d6695bf386c93365bf6797' into gingerbread-plus-aosp
* commit '89a7180a242043a0b4d6695bf386c93365bf6797':
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