Merge commit '9a0bf14c4f715a8ffa645c77c4c183dcfa3e31c8' into eclair-plus-aosp * commit '9a0bf14c4f715a8ffa645c77c4c183dcfa3e31c8': Moving ImProvider to TalkProvider: Change Im.java to use the new TalkProvider; change the authority
Merge commit '9a0bf14c4f715a8ffa645c77c4c183dcfa3e31c8' into eclair-plus-aosp * commit '9a0bf14c4f715a8ffa645c77c4c183dcfa3e31c8': Moving ImProvider to TalkProvider: Change Im.java to use the new TalkProvider; change the authority