diff options
| author | Victor Chang <vichang@google.com> | 2019-08-26 16:47:53 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-26 16:47:53 -0700 |
| commit | e4eaea85b7aa995d524ad9628d0841b7b8001af1 (patch) | |
| tree | 1583003a891813bf5a9c0e7e74011b439f106070 /annotations/generate_annotated_java_files.py | |
| parent | 216c7745aeebe51cedfd8ac49f4db5bc213bfa51 (diff) | |
| parent | a2d046aa110d7a6436e96769a2db6ebb39c1f76c (diff) | |
Merge "Merge "[automerger skipped] DO NOT MERGE [CtsLibcoreOjTestCases] Old Android releases can optionally support the new Japanese era am: 76140645b5 -s ours am: 1dd7cc7ea3 -s ours am: db05217a3d -s ours
am: a2d046aa11 -s ours
am skip reason: subject contains skip directive
Change-Id: I43b6db32feae4bc3eaeeddb7a2717f2e0f9c5978
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions