summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorAndroid Merger <noreply-android-build-merger@google.com>2019-05-21 18:00:07 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-05-21 18:00:07 +0000
commit0a935231529cdb193d383418e02aad00b98e0396 (patch)
tree09a6b79aa2d59d65e941cf71fbe70c874ecfb96f /annotations/generate_annotated_java_files.py
parent33acb52c41562d54ec4a680ecf92cf955e30c8cf (diff)
parent41bfcbacff3e100cff193bb4827b8c272713ffa4 (diff)
Merge "[automerger skipped] DO NOT MERGE [CtsLibcoreOjTestCases] Old Android releases can optionally support the new Japanese era am: faa39d2313 -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