summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorAndroid Merger <noreply-android-build-merger@google.com>2019-08-26 22:16:25 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-08-26 22:16:25 +0000
commit50fd74002b2913673fbc60843ad398b7f39787c2 (patch)
treeaaa7107879765689e32136614e5bd4d39435020c /annotations/generate_annotated_java_files.py
parent1e9c975e08856b2412aa573968b086feaa8f15ba (diff)
parentf043c88c52bf732e53a9835627ac4fced949a126 (diff)
Merge "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"
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions