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