summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorVictor Chang <vichang@google.com>2019-08-26 17:20:40 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-08-26 17:20:40 -0700
commit2e1bc53d950f56c66b698e9a2bf000059e6b1114 (patch)
tree1583003a891813bf5a9c0e7e74011b439f106070 /annotations/generate_annotated_java_files.py
parentd41d6f611b0e65ee0eab9f62b21f45bc7f930254 (diff)
parent14d6922ffe6dcb63368f9f38c55bd44e5182227d (diff)
Merge "[automerger skipped] DO NOT MERGE [CtsLibcoreOjTestCases] Old Android releases can optionally support the new Japanese era am: 714c3b39e5 -s ours am: ad5f526397 -s ours am: 59ce30000b -s ours
am: 14d6922ffe Change-Id: I9ff252118527d2aca9a4400280f977f699bfe120
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions