diff options
| author | Victor Chang <vichang@google.com> | 2019-08-26 15:16:15 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-26 15:16:15 -0700 |
| commit | f043c88c52bf732e53a9835627ac4fced949a126 (patch) | |
| tree | aaa7107879765689e32136614e5bd4d39435020c /annotations/generate_annotated_java_files.py | |
| parent | 1e9c975e08856b2412aa573968b086feaa8f15ba (diff) | |
| parent | b6341d37067a8d88dea91531db62c80dd89bff56 (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 skip reason: subject contains skip directive
Change-Id: I4a62c4e17186839733c483ee05844e51f0b99915
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions