diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:46:10 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:46:10 +0000 |
| commit | fd69f64932d779fd08447d0724274025eeb9acbb (patch) | |
| tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
| parent | f2b95ed48be2d5750f25a62248a600f0bcd9a684 (diff) | |
| parent | 94ac2d84d81fbc1c3927d68230b4fd6a5d3a913f (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 am: a1b430d841 -s ours am: 2b20489d39 -s ours
am: 94ac2d84d8
Change-Id: I3bca67bf8cf8ae69fcb3f7c22baa44682dbfeee2
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions