tree 89f28c29d11979a68dac669ee1b1a0144f7bd046
parent 1bdba9fa3178d00a03dcbc3ede1818f7bff07e61
parent d07833f54b6e8e361b666ae16efa15fdf60159de
author David Brown <dab@google.com> 1286754241 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286754241 -0700

am d07833f5: Don\'t manually create CallerInfo objects from SipPhone

Merge commit 'd07833f54b6e8e361b666ae16efa15fdf60159de' into gingerbread-plus-aosp

* commit 'd07833f54b6e8e361b666ae16efa15fdf60159de':
  Don't manually create CallerInfo objects from SipPhone