tree c43d8d721e187e439d5dc61125747320fb361e36
parent fa45c0ce4ca0b390200dd30e02f9d285a3813c48
parent c6ad5d982b96a2892a9dfe94ceaeae4851b56bfd
author Victor Chang <vichang@google.com> 1561130624 -0700
committer android-build-merger <android-build-merger@google.com> 1561130624 -0700

[automerger skipped] DO NOT MERGE [CtsIcuTestCases] Old Android releases can optionally support the new Japanese era am: 39b8f78cbe -s ours
am: c6ad5d982b -s ours
am skip reason: subject contains skip directive

Change-Id: Ic073ca2d5b8e40abd5a1b9eb31082164c9652a9c