diff options
author | Nikita Iashchenko <nikitai@google.com> | 2019-05-07 11:09:18 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-05-07 11:09:18 -0700 |
commit | b233b3f35056826f8c5c98a03b9722c9e7859b02 (patch) | |
tree | 6023737e44405110da0f764591ab915fbd6076b8 /annotations/generate_annotated_java_files.py | |
parent | c17cef1cf117dc1643d7a7243675d003200c1ff0 (diff) | |
parent | 0447f8ea167cc191b186f620b466e7c08d951f56 (diff) |
[automerger skipped] DO NOT MERGE New Japanese Era implementation with actual Reiwa name (part 2)
am: 0447f8ea16 -s ours
am skip reason: subject contains skip directive
Change-Id: Iefee12b8341c08a0b972c962e66297cc2c60ba4d
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions