summaryrefslogtreecommitdiff
path: root/libs/rs/rsScript.cpp
diff options
context:
space:
mode:
author Hung-ying Tyan <tyanh@google.com> 2010-10-05 18:37:14 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-05 18:37:14 -0700
commit88b4bd5f3e8d6e68541eec4a603b1df83291cf1f (patch)
treeb5b31c36b1e4b0332af9d3c0110c3c88f357b12f /libs/rs/rsScript.cpp
parentba04dbc6cd9ea2f504b76657c85e476a795e9b5b (diff)
parentfc7e7766e7d6a49d31426f821c0a56168c0d75cc (diff)
am fc7e7766: Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread
Merge commit 'fc7e7766e7d6a49d31426f821c0a56168c0d75cc' into gingerbread-plus-aosp * commit 'fc7e7766e7d6a49d31426f821c0a56168c0d75cc': CallManager/SipPhone: fix reject a ringing call
Diffstat (limited to 'libs/rs/rsScript.cpp')
0 files changed, 0 insertions, 0 deletions