summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorNikita Iashchenko <nikitai@google.com>2019-04-08 20:41:09 +0100
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-05-15 05:33:38 +0000
commit272bc8766f11910a4c17a86913d621b56032789e (patch)
tree220d06a87da9c75a4f21b411e76acc5c0a46769c /annotations/generate_annotated_java_files.py
parent074a923a13a686a596154e13ea1394fe60a1ca8f (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