summaryrefslogtreecommitdiff
path: root/libs/rs/rsObjectBase.cpp
diff options
context:
space:
mode:
author Hung-ying Tyan <tyanh@google.com> 2010-09-27 16:29:33 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-09-27 16:29:33 -0700
commit2a36a778d384403cd92b1016ed5c860d3f2c3521 (patch)
treee46cf861b3b921aba3913cb4158fba4d2744559c /libs/rs/rsObjectBase.cpp
parent4e9243d55ce183542c74550e503ea583643599a0 (diff)
parent68ef7f3c3a8deb0e14b0b6325876b23cecc191b3 (diff)
am 68ef7f3c: Merge "Move SipService out of SystemServer to phone process." into gingerbread
Merge commit '68ef7f3c3a8deb0e14b0b6325876b23cecc191b3' into gingerbread-plus-aosp * commit '68ef7f3c3a8deb0e14b0b6325876b23cecc191b3': Move SipService out of SystemServer to phone process.
Diffstat (limited to 'libs/rs/rsObjectBase.cpp')
0 files changed, 0 insertions, 0 deletions