am 5ef7aa7f: Merge "TimerTest cleanup"

* commit '5ef7aa7fbd7ae4a110c4c262de36a0feaa7e48d4':
  TimerTest cleanup
Fix additional races in org.apache.harmony.security.x509.Extensions

Bug: https://code.google.com/p/chromium/issues/detail?id=233610
Bug: 8712523
Change-Id: Ie54f62fa37f31e8ea37b5f4905f0ca3d3e22ac8f
am 4e8de9eb: am 5ef7aa7f: Merge "TimerTest cleanup"

* commit '4e8de9ebb002963675d332ab0e07e9d73500de5a':
  TimerTest cleanup
Merge "Fix additional races in org.apache.harmony.security.x509.Extensions"
am f73a8c28: Merge "Fix additional races in org.apache.harmony.security.x509.Extensions"

* commit 'f73a8c282e8e836871335fa75dcc7a06e914c975':
  Fix additional races in org.apache.harmony.security.x509.Extensions
am 1b21c6e8: am f73a8c28: Merge "Fix additional races in org.apache.harmony.security.x509.Extensions"

* commit '1b21c6e84a63e41cb2a61da2540efae008849d56':
  Fix additional races in org.apache.harmony.security.x509.Extensions
Cope with a corrupt tzdata update.

We need to fall back to the next choice on error. Rewrite the code
to be testable and add some tests. Add an internal GMT-only
fallback in case all our sources of tzdata are bad. Also make
time zone detection on the host more useful.

Bug: 8373554
Change-Id: I9f91b844a61f07f34b268535e6d24aa0c301bf8d
Merge "Cope with a corrupt tzdata update."
am 971709da: Merge "Cope with a corrupt tzdata update."

* commit '971709da542bbaf163c89fce916fc943f0e1101a':
  Cope with a corrupt tzdata update.
am ff72988b: am 971709da: Merge "Cope with a corrupt tzdata update."

* commit 'ff72988b2ff791afc4d101984c9348451f49091c':
  Cope with a corrupt tzdata update.
Fix vogar --mode device's fallback time zone.

Change-Id: Icf7a5ecb5aa7e1b4e6effe26e7a4a63807d18b1c
Merge "Fix vogar --mode device's fallback time zone."
Remove the now-unused ZoneInfoDB.getVersion API.

Change-Id: I05aff6c07e9baca679b8b7759f4f0108067d06e6
am 783feda9: Merge "Fix vogar --mode device\'s fallback time zone."

* commit '783feda93e8645aaf4d5a3b9cbbcd5eeb88b29d8':
  Fix vogar --mode device's fallback time zone.
am 19f10924: am 783feda9: Merge "Fix vogar --mode device\'s fallback time zone."

* commit '19f10924b4f45023862b7caa2be0e180e3b9d977':
  Fix vogar --mode device's fallback time zone.
Add the harmony annotation tests.

Change-Id: Ibbca52bae20e24e2d76d038d85e1ff5411ffc523
Merge "Add the harmony annotation tests."
am bb57ca16: Merge "Add the harmony annotation tests."

* commit 'bb57ca16b8b7577cbf0a03a1a5c9a7211b3f011d':
  Add the harmony annotation tests.
am 6c8adf8d: am bb57ca16: Merge "Add the harmony annotation tests."

* commit '6c8adf8d4645cea64d762f665aad475fb7eb0329':
  Add the harmony annotation tests.
Merge "Remove the now-unused ZoneInfoDB.getVersion API."