Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4991b3e5 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

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

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
parents ddbe4cd3 0df69121

There are no changes