am fef18bfc: resolved conflicts for merge of 383aa124 to eclair-mr2

Merge commit 'fef18bfcb02aa3ffb6ffb0cc13b9dace52de6bd2' into eclair-mr2-plus-aosp

* commit 'fef18bfcb02aa3ffb6ffb0cc13b9dace52de6bd2':
  fix an npe when a user tries to get an auth token from an authenticator that doesn't support it, like exchange