[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: faa39d23 -s ours am: b99e927d -s ours
am: 9d93edc9
Change-Id: I74f2d36859c559d4b5258afc07bfdf2ee0e678b8