summaryrefslogtreecommitdiff
path: root/libs/rs/rsScript.cpp
diff options
context:
space:
mode:
author Hung-ying Tyan <tyanh@google.com> 2010-10-08 18:28:20 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-08 18:28:20 -0700
commitc7e4b2d5bb9c9ab2d4a8efa0fd07be9d83987d36 (patch)
treebf49d4e12a6f0dd8a41477161189b7883f189b5b /libs/rs/rsScript.cpp
parentd856b1ce92b0d14b4e5b87d02f746e0d6ae7dc87 (diff)
parent841d6ff9e05daccbc60daa1618a27e9db3a4fb32 (diff)
am 841d6ff9: am 62ec9834: Merge "Make SipService broadcast SIP_SERVICE_UP when it\'s up." into gingerbread
Merge commit '841d6ff9e05daccbc60daa1618a27e9db3a4fb32' * commit '841d6ff9e05daccbc60daa1618a27e9db3a4fb32': Make SipService broadcast SIP_SERVICE_UP when it's up.
Diffstat (limited to 'libs/rs/rsScript.cpp')
0 files changed, 0 insertions, 0 deletions