Merge commit 'd07833f54b6e8e361b666ae16efa15fdf60159de' into gingerbread-plus-aosp * commit 'd07833f54b6e8e361b666ae16efa15fdf60159de': 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