tree 1583003a891813bf5a9c0e7e74011b439f106070
parent 001e4fac96ec311a769518ee9b9ab27e745023f0
parent e4eaea85b7aa995d524ad9628d0841b7b8001af1
author Victor Chang <vichang@google.com> 1566865710 -0700
committer android-build-merger <android-build-merger@google.com> 1566865710 -0700

Merge "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: db05217a3d -s ours am: a2d046aa11 -s ours
am: e4eaea85b7

Change-Id: Ia40b6889f65d8a49a350e434c6d003cbc3eab340