| commit | 59b20deef20329170f34d411a62c49bba5c640ca | [log] [tgz] |
|---|---|---|
| author | Nikita Iashchenko <nikitai@google.com> | Tue Apr 23 20:51:11 2019 +0100 |
| committer | Nikita Iashchenko <nikitai@google.com> | Wed Aug 07 18:12:49 2019 +0100 |
| tree | 34edcd636fc710d874f06511667a454bc516d5d9 | |
| parent | 08a17ee5edd277c60f358fdb9a30da1086088bec [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: 138560701 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)