diff options
| author | Narayan Kamath <narayan@google.com> | 2016-11-16 20:00:04 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 20:00:04 +0000 |
| commit | 69d0db26298766a2dda48645d1fac7aa70dfc99a (patch) | |
| tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
| parent | 13795899d13fcac7e41b2fd0c117db5898a07e4e (diff) | |
| parent | 7e78eb4e2c3b796f0c7c29751c5c52a1f7a9bf8d (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
am: 7e78eb4e2c
Change-Id: I7d1c41d1be5ae7ce9ff2a4c3b74d8bc4ba13d8d4
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions