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

iEYEABECAAYFAlcNPn8ACgkQ6K0/gZqxDngogQCfQQ9O5ClQobDeo3bDJSlMeJIx
f/QAn0P7xBkjP0SQqzQ7M5ks0RhNlVHs
=HWFI
-----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.