Android n mr1 preview 2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlhGDukACgkQ6K0/gZqxDni7JACfSmeRrtZ0QQlpZ2k5F3KdItoD
e6cAnAplUvyZeY0PMPqeaublyggK8aEn
=PxZG
-----END PGP SIGNATURE-----
Merge "Google Login - when the datastore is corrupt (i.e when the set active user is not a logged in user), an exception is thrown. Fix this by properly logging the error and setting no active user." into idea133
automerge: 507028e

* commit '507028e964c7cbc448cc7273daf5017a3d2fad9f':
  Google Login - when the datastore is corrupt (i.e when the set active user is not a logged in user), an exception is thrown. Fix this by properly logging the error and setting no active user.