tree 3a3eeae57d48831cac0d2f529467a457d242f9df
parent c3bee436205d09a45e9e0d89aca07a3731e87da3
parent 5e0d833710aaba2562f39eb8021a4289bc3bcc5a
author Chung-yih Wang <cywang@google.com> 1282789725 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282789725 -0700

am 5e0d8337: am ea52d35e: Merge "Add dynamic uid info for tracking the sip service usage." into gingerbread

Merge commit '5e0d833710aaba2562f39eb8021a4289bc3bcc5a'

* commit '5e0d833710aaba2562f39eb8021a4289bc3bcc5a':
  Add dynamic uid info for tracking the sip service usage.