[automerger skipped] DO NOT MERGE [CtsLibcoreOjTestCases] Old Android releases...
[automerger skipped] DO NOT MERGE [CtsLibcoreOjTestCases] Old Android releases can optionally support the new Japanese era am: 714c3b39 -s ours am: 78a6f55a -s ours am: 62740f87 -s ours
am: 426661e9
Change-Id: Ibcf475f4c49c4ca09a16250d11ada534733ac9f2