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

Browse Source

Merge commit 'f9b97e6941d5162f676631ffda15eff3d20f3b18'

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

...

This commit is contained in:

Jean-Baptiste Queru

2009-11-15 14:50:52 -08:00

committed by Android Git Automerger

parent bde494aacb f9b97e6941

commit 56baeb3c48

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available