diff options
| author | Narayan Kamath <narayan@google.com> | 2016-11-16 19:52:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:52:34 +0000 |
| commit | 7e78eb4e2c3b796f0c7c29751c5c52a1f7a9bf8d (patch) | |
| tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
| parent | 0aea3b9accd094fe1c68655b124947422a233cb9 (diff) | |
| parent | 752150faa336b29d8b20956405ae3e89af9c8f80 (diff) | |
Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: bc48f87162 -s ours" into lollipop-mr1-cts-dev am: fcd60194c2 -s ours am: 548cad532e -s ours am: 23f3955218
am: 752150faa3
Change-Id: I47bb3d102bada4e7754efd83c8b834fc1d6106eb
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions