tree 7851d5e4caa29bc7aced499a33f98c7b68112b1b
parent 9c52a97ef000d29eeedb42f76b7ebe5e1a4d7e6f
parent fc5a01ba3d76d1286a45703b33cfea8082fe2804
author yumaoka <y.umaoka@gmail.com> 1565289491 -0700
committer android-build-merger <android-build-merger@google.com> 1565289491 -0700

[automerger skipped] DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa support in ICU4J 58
am: fc5a01ba3d -s ours
am skip reason: subject contains skip directive

Change-Id: I3e1e36f917f4ac59f0302c1ccc2b3379e5242b37