diff options
| author | Narayan Kamath <narayan@google.com> | 2016-11-16 19:44:56 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:44:56 +0000 |
| commit | 36fe981be6b717561b37969845cef604dca33a26 (patch) | |
| tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
| parent | ff449885108412364dc4d838bd3950620eff51ff (diff) | |
| parent | 8da42797516bf606e868faf34274be40e6610f2f (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
Change-Id: I982175f1f0ad2ee343ca1f295d26319cfabfe2ec
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions