Android 6.0.1 Release 48 (MMB30M)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAld9gH8ACgkQ6K0/gZqxDnhh9ACfXSt/GtlUebzIK0HSR2TpA/H7
N2kAnR7ixw/OIJJlJ7BW4YuhpDdb6zTz
=P83W
-----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.