summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorDaniel Xie <dxie@google.com>2016-04-11 18:31:46 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-04-11 18:31:46 +0000
commitfe20752d89d81d10564bfb6c9b1eaede602f5847 (patch)
tree5c2502142ea53d9b3154f235de6906557fed665b /annotations/generate_annotated_java_files.py
parent2873b21e0057568c835621fdbdbfcc2692aa2642 (diff)
parent36d5caf700adbca6d904d04017af12182104693a (diff)
Merge "DO NOT MERGE: "Pacific/Apia" is now "Apia Standard Time"." into lollipop-cts-dev
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions