tree 1583003a891813bf5a9c0e7e74011b439f106070
parent 21293b87b9c9b42891f86c13db1d74ed19f26572
parent 965eeb7cb35bb17d7ffde8a1e6326b255fa19b52
author Victor Chang <vichang@google.com> 1565293755 -0700
committer android-build-merger <android-build-merger@google.com> 1565293755 -0700

[automerger skipped] DO NOT MERGE [CtsLibcoreOjTestCases] Old Android releases can optionally support the new Japanese era am: 76140645b5 -s ours am: 4464a8554c am: ed513e7f73 am: df0c7093bb -s ours am: 1ce7660e6f -s ours
am: 965eeb7cb3

Change-Id: I18fb59785061fdfd910907d3e838aa2c25074e99