| commit | f9b97e6941d5162f676631ffda15eff3d20f3b18 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Sun Nov 15 14:46:03 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Nov 15 14:46:03 2009 -0800 |
| tree | 0c6d6b9032d6818dca52c3db20b18680f8df40e1 | |
| parent | 8a4e470fc2c1351d58a6ab2d99eb12d01c5c2656 [diff] | |
| parent | fef18bfcb02aa3ffb6ffb0cc13b9dace52de6bd2 [diff] |
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