diff options
| author | Android Merger <android-build-merger@google.com> | 2016-11-16 19:17:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-11-16 19:17:14 +0000 |
| commit | 2a9d9de7ca7c60342f878a9d068668e593444776 (patch) | |
| tree | 3670478a4ffbad48469ff0a538eb7fb7913bb3b2 /annotations/generate_annotated_java_files.py | |
| parent | 78909a0a706aac3cbd28ede48070ec655e93e6f7 (diff) | |
| parent | 2b20489d39d91c5ece907bd3c1d2e925be5cb44c (diff) | |
Merge "Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names." into lollipop-cts-dev am: 7c504bff74 -s ours" into lollipop-mr1-cts-dev am: a1b430d841 -s ours" into marshmallow-cts-dev
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions