Android 7.0.0 release 21
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlgqLnAACgkQ6K0/gZqxDnhnXACeIT/4xit7JyytnRRUZtNa77SV
sdkAnRhtXtig1kESWGsYMY15DGAEZBhv
=zoeU
-----END PGP SIGNATURE-----
Merge "Workaround for HttpURLConnection.getFollowRedirects() on M" am: 3b37453b1c
am: f0bc25d83d

* commit 'f0bc25d83ddceccd61c2c11a4fa71b9157290363':
  Workaround for HttpURLConnection.getFollowRedirects() on M