Android 6.0.1 release 25 (MTC19T)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlco4HQACgkQ6K0/gZqxDnhCOwCfUzuVfmB9SmDk1QmuNIQ4kl1t
0WQAn0L9wvg0W23ersgDXsQ24VIZ2bRN
=GkJl
-----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.