summaryrefslogtreecommitdiff
path: root/libs/rs/rsProgramRaster.cpp
diff options
context:
space:
mode:
author Hung-ying Tyan <tyanh@google.com> 2010-09-15 07:08:38 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-09-15 07:08:38 -0700
commitfbfb6f2f04ec721c0a9fa5913b44326dbf4140d0 (patch)
tree04dbb776f14eee5f8ee2b51561e8d99702faa11c /libs/rs/rsProgramRaster.cpp
parentf6a04aeeed4bdb89c5ef8db86ece2617b99aca87 (diff)
parent188a8f1b72452bc294daa2186e93771543be0478 (diff)
am 188a8f1b: am 89a7180a: Merge "SipService: ignore connect event for non-active networks." into gingerbread
Merge commit '188a8f1b72452bc294daa2186e93771543be0478' * commit '188a8f1b72452bc294daa2186e93771543be0478': SipService: ignore connect event for non-active networks.
Diffstat (limited to 'libs/rs/rsProgramRaster.cpp')
0 files changed, 0 insertions, 0 deletions