| commit | fd50d24ddc82b8e7663f0d68e7f2a6a4b8b212e8 | [log] [tgz] |
|---|---|---|
| author | Nikita Iashchenko <nikitai@google.com> | Tue Apr 23 20:51:11 2019 +0100 |
| committer | android-build-team Robot <android-build-team-robot@google.com> | Tue May 14 19:52:40 2019 +0000 |
| tree | eeb56384e0d7de7f004b768c1d79603df2ab3004 | |
| parent | ee7e881507668903b57aaf6afff5be59c960b031 [diff] |
DO NOT MERGE New Japanese Era implementation 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: 131312444 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) (cherry picked from commit 0447f8ea167cc191b186f620b466e7c08d951f56)