am 6e71c9e3: add timezone setting

* commit '6e71c9e3245704e74e1b128f47f8ab8d6badde0d':
  add timezone setting
am f0c85fa1: Merge "CertificateRequest should handle case where certificate is requested but none is available."

* commit 'f0c85fa16995e1c715c679aea704392a162f493a':
  CertificateRequest should handle case where certificate is requested but none is available.
am 6a57effa: Remove flakiness from OldSocketChannelTest#test_socketChannel_read_DirectByteBuffer.

* commit '6a57effa362779c04081a5b1588410c3953aa2b1':
  Remove flakiness from OldSocketChannelTest#test_socketChannel_read_DirectByteBuffer.
am 8399ee3e: Remove flakiness from libcore.javax.net.ssl.SSLSessionTest#test_SSLSession_getCreationTime.

* commit '8399ee3eb85894946668475af43259597a1d0f36':
  Remove flakiness from libcore.javax.net.ssl.SSLSessionTest#test_SSLSession_getCreationTime.
am 7b218fdf: Merge "OldDateFormatTest is flaky; improve its output."

* commit '7b218fdfcc6cdf32c9b1c9fc5acf8b353705965a':
  OldDateFormatTest is flaky; improve its output.
am dfe203b9: OldDateFormatTest is flaky; improve its output.

* commit 'dfe203b9f580f238240d56b4878336594af9b2cc':
  OldDateFormatTest is flaky; improve its output.
merge in jb-release history after reset to jb-dev
Reconcile with jb-mr0-release

Change-Id: I8032e41715a61eca2d50bd07406d43bb0983db32
resolved conflicts for merge of 02ba68ce to jb-dev-plus-aosp

Change-Id: I1c896520ac7c4d5cd76463a091af2a98b76ddd30
am 2ac3f4de: Address flakiness of doFinal and unwrap CipherTests

* commit '2ac3f4de596bdeea397e25692b4a4f5a6c15426f':
  Address flakiness of doFinal and unwrap CipherTests
am 1f02ac49: Merge "Address flakiness of doFinal and unwrap CipherTests"

* commit '1f02ac49bd26e848435a289e713ba34c29fd6608':
  Address flakiness of doFinal and unwrap CipherTests
am 518cfbc4: Merge "TLS + SNI + proxy => bug : the SNI at the TLS layer is the hostname of the proxy instead of the hostname in the URL"

* commit '518cfbc45544a7c99eb8a85e67003b8f7a413a76':
  TLS + SNI + proxy => bug : the SNI at the TLS layer is the hostname of the proxy instead of the hostname in the URL
am bfbbc10c: Merge "Second chunk of Support_PortManager removal."

* commit 'bfbbc10c3642d4a663858f2e7e7203d66e918550':
  Second chunk of Support_PortManager removal.
am c0f040a4: Merge "Remove another batch of Support_PortManager cruft."

* commit 'c0f040a4c4813488c56f06804bc129508009467c':
  Remove another batch of Support_PortManager cruft.
am 4f81a060: TLS + SNI + proxy => bug : the SNI at the TLS layer is the hostname of the proxy instead of the hostname in the URL

* commit '4f81a0603dcec28609b762634be603c759a291cd':
  TLS + SNI + proxy => bug : the SNI at the TLS layer is the hostname of the proxy instead of the hostname in the URL
Merge branch 'jb-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/libcore into jb-dev-plus-aosp
am 5ac82ce2: Merge "Add a test for Method.getParameterAnnotations."

* commit '5ac82ce2215fb38ad965d32bcabba1ac3e1e2eec':
  Add a test for Method.getParameterAnnotations.
am d44e8b8b: Merge "Clean up ICU error reporting."

* commit 'd44e8b8b339510e349c1d744875687cd7e4c439f':
  Clean up ICU error reporting.
am e25c9d72: Merge "Provider should enumerate services in the order they are added"

* commit 'e25c9d72b136f274c67207698bcc2c8508a59957':
  Provider should enumerate services in the order they are added
am fe1daea1: Merge "Fix OpenSSLSocketImpl.close race"

* commit 'fe1daea160b11cbb422e64ad7fc34a7caea32ab5':
  Fix OpenSSLSocketImpl.close race