tree 1583003a891813bf5a9c0e7e74011b439f106070
parent ffa68645849b711e1cfc391d829c8818196da1b9
parent bda1413b4aa26b644bd4aaefcf54e305d0586f33
author Victor Chang <vichang@google.com> 1565295052 -0700
committer android-build-merger <android-build-merger@google.com> 1565295052 -0700

Merge "[automerger skipped] DO NOT MERGE [CtsLibcoreOjTestCases] Old Android releases can optionally support the new Japanese era am: 76140645b5 -s ours am: 1dd7cc7ea3 -s ours am: f381b85137 -s ours am: 9ffcfd4428 -s ours am: 4bfff52f8b
am: bda1413b4a

Change-Id: Id610703280a70eefc4fded30678fa8bc324e9cda