summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2020-06-25 23:31:49 +0000
committerAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2020-06-25 23:31:49 +0000
commita5a1744f72d0c01672694e71f7acd317e9c1249e (patch)
treec648766da6552f956556c471d5a269c9b64d5825 /annotations/generate_annotated_java_files.py
parent253022fb25d03bb04152e5d99ff2e4a449193748 (diff)
parent6543d6ed08e175d766455ac5944dd69867b93a2b (diff)
[automerger skipped] Merge "Merge "Track tzdb 2020a changes [N CTS branch]" into nougat-cts-dev am: 27dfa1af40" into nougat-mr1-cts-dev am: 2aeac88223 -s ours skipped: 6543d6ed08
Change-Id: I5ef368aea402f254198825824af1e5c3d31d65ab
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions