8788d14036
Merge commit '306137d97f40a4f807c54a75210343c9262360d1' into gingerbread-plus-aosp * commit '306137d97f40a4f807c54a75210343c9262360d1': SIP telephony cleanup.