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-30 18:14:33 +0000
committerAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2020-06-30 18:14:33 +0000
commitf109dbf6d3c97918e5b16e7def63ae2da49961ad (patch)
treee0d97229898a3b80f7d40234ece8065ff3a426ec /annotations/generate_annotated_java_files.py
parent6ccb6445126fae21eaa726c782ff5d8d9e9c7a03 (diff)
parent145f724ad432fad10ef7282965150185216f24f3 (diff)
[automerger skipped] Merge "Track tzdb 2020a changes [N MR1 CTS branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours skipped: 71fc6b75a3 skipped: 145f724ad4
Change-Id: I51cf4b1100859f353afe4b564dfe3e5978ec9db2
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions