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:00 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-08-26 22:16:00 +0000
commit1e9c975e08856b2412aa573968b086feaa8f15ba (patch)
treeaaa7107879765689e32136614e5bd4d39435020c /annotations/generate_annotated_java_files.py
parent718417eefe41ef5992140d619f01b4d95f4da651 (diff)
parent464c3902788beb8502f539b980f9185cafcf8858 (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: 520c4fceb9 -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