tree 1583003a891813bf5a9c0e7e74011b439f106070
parent bacb3235a39d962218ea0c621588da20f550fe86
parent 46ebd5b38d5dbfecca880603c8b59651c8f1a741
author Victor Chang <vichang@google.com> 1565295182 -0700
committer android-build-merger <android-build-merger@google.com> 1565295182 -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
am: 46ebd5b38d

Change-Id: Ia4b11f89d25136ab88d44a526a40131bac2eb151