diff options
| author | Narayan Kamath <narayan@google.com> | 2016-11-16 19:52:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:52:20 +0000 |
| commit | 0aea3b9accd094fe1c68655b124947422a233cb9 (patch) | |
| tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
| parent | c0b440435cbb84d60fe142c42806d226ba5c8c58 (diff) | |
| parent | 36fe981be6b717561b37969845cef604dca33a26 (diff) | |
Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: bc48f87162 -s ours am: 70bfafe61c -s ours" into marshmallow-cts-dev am: bb1f9a08da -s ours am: 8da4279751
am: 36fe981be6
Change-Id: I3f17a236403eefef618887904499b9786e088977
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions