tree 390102b84ec81e136b0c3a4d1194c1c5db040162
parent fdc624aaa7f8218b71bbbf8f8a2814ee4867af74
parent 34552149e4b997d4ed3383fc153faff2bb189066
author Hung-ying Tyan <tyanh@google.com> 1285878976 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285878976 -0700

am 34552149: am 6a53489a: SipService: add UID check.

Merge commit '34552149e4b997d4ed3383fc153faff2bb189066'

* commit '34552149e4b997d4ed3383fc153faff2bb189066':
  SipService: add UID check.