summaryrefslogtreecommitdiff
path: root/libs/rs/rsProgram.cpp
diff options
context:
space:
mode:
author Hung-ying Tyan <tyanh@google.com> 2010-09-28 12:47:49 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-09-28 12:47:49 -0700
commit6c6eacda8066728537f2d8828e4c123f91ddfc27 (patch)
tree37a5a677369065ff7e82ff7992ec4c0915de00db /libs/rs/rsProgram.cpp
parent3c094de4a9d4793bba8f826a43ef84f509a743c4 (diff)
parentf7e13400b24bdc5461e640cfb2c9cb2bbb2b6236 (diff)
am f7e13400: am 624d5b4e: SIP: add DisconnectCause.SERVER_ERROR
Merge commit 'f7e13400b24bdc5461e640cfb2c9cb2bbb2b6236' * commit 'f7e13400b24bdc5461e640cfb2c9cb2bbb2b6236': SIP: add DisconnectCause.SERVER_ERROR
Diffstat (limited to 'libs/rs/rsProgram.cpp')
0 files changed, 0 insertions, 0 deletions