[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 skip reason: subject contains skip directive
Change-Id: Ic240beef0347717ae5c1521f9c64d3494a6aad06