summaryrefslogtreecommitdiff
path: root/libs/rs/rsProgramRaster.cpp
diff options
context:
space:
mode:
author Hung-ying Tyan <tyanh@google.com> 2010-09-14 10:00:14 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-09-14 10:00:14 -0700
commit188a8f1b72452bc294daa2186e93771543be0478 (patch)
treeede7c62ca560ca81a5cf0714129710b4c8734f98 /libs/rs/rsProgramRaster.cpp
parentf9c7a3e25e6e83292051414246cb1fc0c5f85207 (diff)
parent89a7180a242043a0b4d6695bf386c93365bf6797 (diff)
am 89a7180a: Merge "SipService: ignore connect event for non-active networks." into gingerbread
Merge commit '89a7180a242043a0b4d6695bf386c93365bf6797' into gingerbread-plus-aosp * commit '89a7180a242043a0b4d6695bf386c93365bf6797': SipService: ignore connect event for non-active networks.
Diffstat (limited to 'libs/rs/rsProgramRaster.cpp')
0 files changed, 0 insertions, 0 deletions