diff options
| author | Narayan Kamath <narayan@google.com> | 2016-11-16 19:16:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:16:44 +0000 |
| commit | 548cad532e28479aa5fe267b0a51871625a02f25 (patch) | |
| tree | 3670478a4ffbad48469ff0a538eb7fb7913bb3b2 /annotations/generate_annotated_java_files.py | |
| parent | 72929bf47603a713bd3a5ae901f7f12833c8264f (diff) | |
| parent | fcd60194c22579b0f3dcd4c88579e75dbedd830f (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
Change-Id: I24707cde099a3a5fc54d9dc4cc49c77bba5227e7
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions