tree 1583003a891813bf5a9c0e7e74011b439f106070
parent dbd6b0f258deac726985420446a4ec5e8be7708f
parent 216c7745aeebe51cedfd8ac49f4db5bc213bfa51
author Victor Chang <vichang@google.com> 1566865551 -0700
committer android-build-merger <android-build-merger@google.com> 1566865551 -0700

Merge "[automerger skipped] DO NOT MERGE [CtsLibcoreOjTestCases] Old Android releases can optionally support the new Japanese era am: 76140645b5 -s ours am: 1cbd924a11 -s ours am: b6341d3706 -s ours am: 3f87289896 -s ours
am: 216c7745ae

Change-Id: I405fee6107214a4b2c5b66eef16cc90d16735398