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