summaryrefslogtreecommitdiff
path: root/libs/rs/rsScript.cpp
diff options
context:
space:
mode:
author John Huang <jsh@google.com> 2010-10-19 09:54:16 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-19 09:54:16 -0700
commit78c206c75095b4a9092aabed8e79702ae0c5dc86 (patch)
treeb18619d2fbcdb4a8d01f1f37ee5bfa7f6f53e68c /libs/rs/rsScript.cpp
parent723e997ef9745ad05c2499509c21976a42f2f278 (diff)
parent085996c411b4d3878dfd97c59bfc4a17da08959b (diff)
am 085996c4: am 45bd8303: Merge "Uncomment SIP/VOIP feature check in SipManager." into gingerbread
Merge commit '085996c411b4d3878dfd97c59bfc4a17da08959b' * commit '085996c411b4d3878dfd97c59bfc4a17da08959b': Uncomment SIP/VOIP feature check in SipManager.
Diffstat (limited to 'libs/rs/rsScript.cpp')
0 files changed, 0 insertions, 0 deletions