commit | 4ccc3f93984d8dd793d9e5160fd28efc806cdbc8 | [log] [tgz] |
---|---|---|
author | Nikita Iashchenko <nikitai@google.com> | Tue Apr 23 20:51:11 2019 +0100 |
committer | Victor Chang <vichang@google.com> | Tue May 14 20:15:14 2019 +0100 |
tree | 64121c62156f540ff0b94b1a5163ee38c4af0e54 | |
parent | 4d55abb1d7f0b878e9638c3fe9296f03a2947aa7 [diff] |
DO NOT MERGE New Japanese Era test changes with actual Reiwa name (part 2) This change should have been done as a part of http://r.android.com/940636 but was accidentally missed during merging. It includes the following upstream commit: 8205432: Replace the placeholder Japanese era name http://hg.openjdk.java.net/jdk/jdk/rev/3d8934bf505a Bug: 132197588 Test: cts-tradefed run cts-dev -m CtsLibcoreOjTestCases Test: cts-tradefed run cts-dev -m CtsLibcoreTestCases Change-Id: Ie74af5b9cb5559a829cbb671f87fd791d1680d8b Merged-In: Ie74af5b9cb5559a829cbb671f87fd791d1680d8b (cherry picked from commit f7e9b4bca83b7d82fdf1c1e794163b4fc9dd4a1e)