diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-15 16:47:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 16:47:22 -0700 |
| commit | d805e332c1be31f1aa91c226ffd4fa740420c764 (patch) | |
| tree | 1049acf697ef2fe83a12a74bbf426b864eba5ea6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3171c71b0c1494f2bf908d29a129ac0590cbadc7 (diff) | |
| parent | bf7ee96973921a1626d89a91d35d1513cd5cd025 (diff) | |
am 8d9e8de2: am 096df819: Merge "SipService: send SERVER_ERROR if server doesn\'t provide nonce" into gingerbread
Merge commit '8d9e8de2c920e8c9dc2da33410780ec739076bb9'
* commit '8d9e8de2c920e8c9dc2da33410780ec739076bb9':
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