tree e46cf861b3b921aba3913cb4158fba4d2744559c
parent 4e9243d55ce183542c74550e503ea583643599a0
parent 68ef7f3c3a8deb0e14b0b6325876b23cecc191b3
author Hung-ying Tyan <tyanh@google.com> 1285630173 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285630173 -0700

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.