diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-27 23:58:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-27 23:58:08 -0700 |
| commit | 1e5c4fe3b434ad815bfc38e303b94643208e08ee (patch) | |
| tree | e3fe56f3a9a380af64cd06de2c2cab32a08165a0 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c11621a77d62fdd9d3736090239c7b6735b60ee5 (diff) | |
| parent | ced8172ac1c4b0140751e1e285d795494a206128 (diff) | |
am 624d5b4e: SIP: add DisconnectCause.SERVER_ERROR
Merge commit '624d5b4e8c20516516d0bff74479b9f5abdfe61c' into gingerbread-plus-aosp
* commit '624d5b4e8c20516516d0bff74479b9f5abdfe61c':
SIP: add DisconnectCause.SERVER_ERROR
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions