diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 20:01:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 20:01:13 +0000 |
| commit | a8d99cb8ecb6780fa2b61fb45da185b6737b2d2b (patch) | |
| tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
| parent | 5c11ae3198c9241946084f3f6f1fe5d22b207772 (diff) | |
| parent | b6bb3dfc52e17bd464e1f530db64a27b3b4cbfb5 (diff) | |
Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names." into lollipop-cts-dev am: 7c504bff74 -s ours" into lollipop-mr1-cts-dev am: a1b430d841 -s ours am: 2b20489d39 -s ours am: 94ac2d84d8 am: fd69f64932
am: b6bb3dfc52
Change-Id: Ia66ca2f2776482490296d8fba2681e8ddcc1a4d0
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions