summaryrefslogtreecommitdiff
path: root/libs/rs/rsProgram.cpp
diff options
context:
space:
mode:
author Hung-ying Tyan <tyanh@google.com> 2010-09-28 13:02:55 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-09-28 13:02:55 -0700
commit0d44776016cecf1c7c826c4784f8f867a56235f0 (patch)
treecf090888189a597a72a8e1670124dc49a8e71d61 /libs/rs/rsProgram.cpp
parent0d0dc6a70cbe0d7bfb795f937d6594711140b4b1 (diff)
parent6d028dd2f102a6eafaa2edebeb55f55b4c32fc42 (diff)
am 6d028dd2: Merge "SIP: Feedback any provisional responses in addition to RING" into gingerbread
Merge commit '6d028dd2f102a6eafaa2edebeb55f55b4c32fc42' into gingerbread-plus-aosp * commit '6d028dd2f102a6eafaa2edebeb55f55b4c32fc42': SIP: Feedback any provisional responses in addition to RING
Diffstat (limited to 'libs/rs/rsProgram.cpp')
0 files changed, 0 insertions, 0 deletions