tree 1ab9fec699641f5be0d4ba9dd2c5d44fd21b0bd0
parent f8a7953ff8f3cb0fef652683b2edeb2cf91b5a87
parent bf1f8696d713c9de7c7523746abb2b7ad4dc5875
author Chung-yih Wang <cywang@google.com> 1282789591 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282789591 -0700

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

Merge commit 'ea52d35e5685094f4d2cca5012239bde66f2c4fe' into gingerbread-plus-aosp

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