diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-15 07:42:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 07:42:38 -0700 |
| commit | bf7ee96973921a1626d89a91d35d1513cd5cd025 (patch) | |
| tree | 1b4d284d76610faa682262216e18d7956df073d7 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c3784ebfef1bab9058929653e946745b39735a04 (diff) | |
| parent | d8af3ea5491dcca4831b3b22268566948ca1742b (diff) | |
am 096df819: Merge "SipService: send SERVER_ERROR if server doesn\'t provide nonce" into gingerbread
Merge commit '096df8197b9133703d2ed0abb69813db0c8b4129' into gingerbread-plus-aosp
* commit '096df8197b9133703d2ed0abb69813db0c8b4129':
SipService: send SERVER_ERROR if server doesn't provide nonce
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions