summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorAndroid Merger <android-build-merger@google.com>2017-02-21 19:13:59 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-02-21 19:14:00 +0000
commit4cf7af7528224d2284b8df2bc22bfee2a3c325f9 (patch)
tree8d47d9e7448268dcd41969638cbd406f95da7341 /annotations/generate_annotated_java_files.py
parent178f701a394a96d55d49f21a35273f33c81f829e (diff)
parentd5921a4b15d386de0e6ed909d6e3c8047c4ac761 (diff)
Merge "Merge "Merge commit 'fc575bca313624a7cba20171fbaa625bbc852cd4' into nougat-mr1-cts-dev" into nougat-mr1-cts-dev am: 1c26d74db1"
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions