am 04e25f30: Fix socket timeout test failures.

* commit '04e25f30524dc7b51f280912d6ca97d991ae84b0':
  Fix socket timeout test failures.
Move OpenSSLSocketImpl.close resource cleanup into a finally clause

Bug: 5466273

Change-Id: I64758dfd3ca1c35d08616c63982223d84fdc2759
Merge "Move OpenSSLSocketImpl.close resource cleanup into a finally clause"
merge in ics-release history after reset to master
Rename LOGV(_IF) to ALOGV(_IF)  DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/143865

Bug: 5449033
Change-Id: Ifc8ada20e2b316bb24aa4ba3483e2fcbb9439669
am f3c9acbc: (-s ours) Rename LOGV(_IF) to ALOGV(_IF)  DO NOT MERGE

* commit 'f3c9acbc3ebd72090221f1781f7f48c0390c1c44':
  Rename LOGV(_IF) to ALOGV(_IF)  DO NOT MERGE
am ec8de076: Fix socket timeout test failures.

* commit 'ec8de076ac382cded43952ba0c2972282b09e1c7':
  Fix socket timeout test failures.
am c16a5993: Merge remote branch \'goog/ics-mr0\' into ics-mr1

* commit 'c16a5993cd284f7f123cf13a9dd9789ce7b60237':
am b62b2d01: am ec8de076: Fix socket timeout test failures.

* commit 'b62b2d0115841037780f1a0d538dad5c30870827':
  Fix socket timeout test failures.
am c5ed03d6: am c16a5993: Merge remote branch \'goog/ics-mr0\' into ics-mr1

* commit 'c5ed03d699aa7abb40ce3559dde17bc8dc0364a2':
merge in ics-release history after reset to master
reset to ics-mr1, but keep history
undo reset to ics-mr1 until we have a better method
am 7e6d4790: Merge "Only tag/untag sockets when open." into ics-mr1

* commit '7e6d479045f5939f2d49c274c181bcb5a7e33d35':
  Only tag/untag sockets when open.
merge in ics-release history after reset to master
Add pfx extension as "application/x-pkcs12"

* This is what MS Exchange uses when it creates user certificates,
  and the Email/Exchange application need to know about the
  extension -> mime type mapping

Bug: 5524693
Change-Id: Ie17308070e9ec32446cb6071775b5570f4b40c23
Merge "Add pfx extension as "application/x-pkcs12""
keep previous history after reset to mr1 plus aah changes (ics-aah-wip)
Add a mode to UriCodec to handle invalid URLs without throwing.

Bug: http://code.google.com/p/android/issues/detail?id=21064
Change-Id: I0c0003bbacc5b9680d9f699134c02648e0d6dbea
Improve the documentation of toString methods in the java.net package.

A developer wanted to know why their InterfaceAddress string began with a "/",
which wasn't obvious from our crappy documentation. This kind of thing should
always include examples, so let's include some examples...

Change-Id: Ic0a555c880e7f2dd31e4801926523f1aa96461c8