diff options
| author | Nikita Iashchenko <nikitai@google.com> | 2020-02-19 14:03:24 +0000 |
|---|---|---|
| committer | Nikita Iashchenko <nikitai@google.com> | 2020-02-19 15:54:44 +0000 |
| commit | 77200add8040bbbb00464cbacff687d615db9935 (patch) | |
| tree | 4b2cef2bcd367b26be5a1e3a58a5f43810e13ff5 /annotations/generate_annotated_java_files.py | |
| parent | 377449dce83e5b37acc5212f447343cadd63cd2f (diff) | |
Add markers for new Japanese Era related files
CLs https://r.android.com/1237091 and https://r.android.com/940636
integrated two upstream OpenJDK commits to finalize support for
new Japanese Era Reiwa:
* http://hg.openjdk.java.net/jdk/jdk/rev/6a4abdb6749c
8174268: Declare a public field in JapaneseEra for the era starting May 2019
* http://hg.openjdk.java.net/jdk/jdk/rev/3d8934bf505a
8205432: Replace the placeholder Japanese era name
This CL adds the appropriate change markers for the differences
relative to the respective upstream revision
(OpenJDK 8u121-b13 or 8u222, depending on the file).
Bug: 149437171
Test: CtsLibcoreTestCases CtsLibcoreOjTestCases
Change-Id: I182bc98a374c127b2e6cee41991427f4fe5b9b54
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions