tree a91f25d8f01c2caac84f102b2820d8db2dd3cc48
parent 53e20b65ebd073947958393308120c186075b115
parent f0bc25d83ddceccd61c2c11a4fa71b9157290363
author Neil Fuller <nfuller@google.com> 1449223614 +0000
committer android-build-merger <android-build-merger@google.com> 1449223614 +0000

Merge "Workaround for HttpURLConnection.getFollowRedirects() on M" am: 3b37453b1c
am: f0bc25d83d

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