Android 6.0.1 release 24
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlcDBdAACgkQ6K0/gZqxDnjf6gCeLmPU47UTKYdZ7HhB+k33p6Qd
H2oAnj1CmaoVn4mr8hHm3CGrcxzcTfO3
=kbmz
-----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.