tree f5531e12bcb4c220665e3f44ef01d14d3e5e59a2
parent 5a41a17a20c93641334a596c356fae6d99e3df67
parent 6d3859960e52daf10b48b4d0ce45b011fa27f3a7
author David Ng <dave@codeaurora.org> 1449709994 -0800
committer David Ng <dave@codeaurora.org> 1449709994 -0800
mergetag object 6d3859960e52daf10b48b4d0ce45b011fa27f3a7
 type commit
 tag android-6.0.1_r3
 tagger The Android Open Source Project <initial-contribution@android.com> 1449526280 -0800
 
 Android 6.0.1 release 3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlZmBAgACgkQ6K0/gZqxDni3fgCcDWWsz738clcfXyS/u6WfvH6f
 oiwAn1T9o4czlUouK0exdOtehm0WHUCj
 =EA2N
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Revert "DO NOT MERGE Revert "okio: increase segment size to 8 KiB""
  DO NOT MERGE Revert "okio: increase segment size to 8 KiB"
  Fix Http(s)URLConnectionImpl.getInstanceFollowsRedirects()

Change-Id: I8fdef69a7284be365f4f5fc74aac567fa4fdec0e