diff options
| author | Narayan Kamath <narayan@google.com> | 2016-11-16 19:59:49 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:59:49 +0000 |
| commit | 13795899d13fcac7e41b2fd0c117db5898a07e4e (patch) | |
| tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
| parent | 04e44a1cc40bb0bbde5264ecea3501e758fd737b (diff) | |
| parent | 0aea3b9accd094fe1c68655b124947422a233cb9 (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
am: 0aea3b9acc
Change-Id: I3993d2d40f0be742a68906fc4cc2cfc68736d23d
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions