tree b4e1606b9113b79aee9e81cc2b5d68d7ae2ccbd6
parent 8cba8c612e2ebc55e3d2e15726a1d24bb4119718
parent e79366b4f9ccde05d5a4c9eaac9edb052441d343
author Wei Huang <weih@google.com> 1250294402 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1250294402 -0700

am c650bf58: Get rid of Settings.getJIDResource(), which really should live in GTalkService. Add API to store the JID resource in IM provider settings.

Merge commit 'c650bf583dbed8701da9a49b9dbd9023768f0df8'

* commit 'c650bf583dbed8701da9a49b9dbd9023768f0df8':
  Get rid of Settings.getJIDResource(), which really should live in GTalkService. Add API to store the JID resource in IM provider settings.