diff options
| author | Nikita Iashchenko <nikitai@google.com> | 2019-04-08 20:41:09 +0100 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-14 19:52:29 +0000 |
| commit | b5b172fff874b6377771faf3a3399e9228fd7fee (patch) | |
| tree | 220d06a87da9c75a4f21b411e76acc5c0a46769c /annotations/generate_annotated_java_files.py | |
| parent | 62394f90497a2f29e27eb5a783fa7f69b9ac5956 (diff) | |
DO NOT MERGE New Japanese Era implementation with actual Reiwa name
Integrate OpenJDK commit for new Japanese Era name:
- 8205432: Replace the placeholder Japanese era name
http://hg.openjdk.java.net/jdk/jdk/rev/3d8934bf505a
Bug: 131312444
Test: CtsLibcoreTestCases
Test: CtsLibcoreOjTestCases
Change-Id: Ic07b536e7fd62b2d3e0fe4e9edd36d6c6f183b06
Merged-In: Ic07b536e7fd62b2d3e0fe4e9edd36d6c6f183b06
(cherry picked from commit 87818a65fdce8f72f888a9adfb96018249105a8a)
(cherry picked from commit d4828ec1c8e487f3e4a2470eb8fb06543dfdbc37)
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions