tree a4bd124705e64d852e6d411139b11f299ea7d7b9
parent f434dd1660f222a1ee85e77c98893b90857805c2
parent 747c61535281b4d2958e293e83245a19ba58f6a0
author David Brown <dab@google.com> 1284601105 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284601105 -0700

am 747c6153: ContactsContract: update SipAddress to be multi-valued

Merge commit '747c61535281b4d2958e293e83245a19ba58f6a0' into gingerbread-plus-aosp

* commit '747c61535281b4d2958e293e83245a19ba58f6a0':
  ContactsContract: update SipAddress to be multi-valued