Android N MR2 Preview 2
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAljj2VUACgkQ6K0/gZqxDnj6ugCaAwzpvYEtEyxh4Iorq04NbvJg
wrUAnR6H1f8Di/kNt+D7Ea80wlE1F5Md
=W3w7
-----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.