commit 0873400ef65e89e83b13ab8063802a3b8439ab70
author Victor Chang <vichang@google.com> Mon Mar 28 17:38:56 2022 +0100
committer Victor Chang <vichang@google.com> Mon Mar 28 17:38:56 2022 +0100
tree 41da290beaacc9dc135c4733e6fd89d3b103bb2b
parent 27ac78a2d3aa017c51d9931bfcfd4ab9c6e1f1ac
parent 145804397745db525fc8e26500638d7006e969a6

Merge files from jdk8u/jdk8u212-b01 into the expected_upstream branch

List of files:
  ojluni/src/main/java/sun/util/calendar/Era.java
  ojluni/src/main/resources/calendars.properties
  ojluni/src/test/java/time/tck/java/time/chrono/TCKJapaneseChronology.java
  ojluni/src/test/java/time/tck/java/time/chrono/TCKJapaneseEra.java
  ojluni/src/test/java/time/test/java/time/chrono/TestJapaneseChronology.java
  ojluni/src/test/java/time/test/java/time/chrono/TestUmmAlQuraChronology.java
  ojluni/src/test/java/time/test/java/time/format/TestNonIsoFormatter.java

Generated by tools/expected_upstream/ojluni_refresh_files.py
Test: N/A
Change-Id: Ib4dbef216003abdc53a4cbed2aa2dfd80486716e