diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:15:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:15:35 +0000 |
| commit | be4cc6c8c028a335d8b274bf8bde1ae1a283e3b8 (patch) | |
| tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
| parent | a21cbb74ed9a5a5081116fea5e38d94ecd338b2d (diff) | |
| parent | 094e5227a5c9584756e1003d8b4548b1abcbd7ae (diff) | |
Merge "DO NOT MERGE IDN: Fix handling of long domain names." into marshmallow-cts-dev am: 21ea90da73 -s ours am: db1076a483
am: 094e5227a5
Change-Id: Ie568ed1bac4d2c8e86845ee9ba3869e0fa975085
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions