diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:32:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:32:18 +0000 |
| commit | 2bc988eb069074cf9b2796b5ccce1106eebce283 (patch) | |
| tree | ce25c28163ad9d9ea9809cdbae0ce097ea5bc07c /annotations/generate_annotated_java_files.py | |
| parent | a5d8ba2b2dc7a42f58414ae1fa8795fb58614f8e (diff) | |
| parent | 78909a0a706aac3cbd28ede48070ec655e93e6f7 (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
am: 78909a0a70 -s ours
Change-Id: I4e1e18dc2a82a456b2c66845c80e394c03719f60
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions