diff options
| author | Nikita Iashchenko <nikitai@google.com> | 2019-05-07 11:09:08 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-07 11:09:08 -0700 |
| commit | c17cef1cf117dc1643d7a7243675d003200c1ff0 (patch) | |
| tree | 6023737e44405110da0f764591ab915fbd6076b8 /annotations/generate_annotated_java_files.py | |
| parent | b297a7ab16894f3240335b1681686f7e7043a097 (diff) | |
| parent | be7dad89341a31cae737b00eb7952317d13c6f69 (diff) | |
[automerger skipped] DO NOT MERGE Replace the placeholder Japanese era name in calendar.properties
am: be7dad8934 -s ours
am skip reason: subject contains skip directive
Change-Id: I15e8ae4718638c15f8f949ae27c5e6739a9f03d1
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions