diff options
| author | Android Merger <android-build-merger@google.com> | 2016-11-16 19:09:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-11-16 19:09:24 +0000 |
| commit | a1b430d8416c55144b8aa50ff996797064c74995 (patch) | |
| tree | e6503f05ca69278a0237021a07cbbe2c922fc918 /annotations/generate_annotated_java_files.py | |
| parent | fcd60194c22579b0f3dcd4c88579e75dbedd830f (diff) | |
| parent | df85514873da8cd635b660e986527259397fd884 (diff) | |
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
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions