diff options
| author | Narayan Kamath <narayan@google.com> | 2016-11-16 19:45:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:45:25 +0000 |
| commit | ff30dfee79eab6e936e08bc05f2d894af28ff69c (patch) | |
| tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
| parent | 752150faa336b29d8b20956405ae3e89af9c8f80 (diff) | |
| parent | 4a8df64b10d8a96f933bfd307a1fc2f1a80d0ba3 (diff) | |
Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: bc48f87162 -s ours" into lollipop-mr1-cts-dev am: fcd60194c2 -s ours" into marshmallow-cts-dev am: 361ff1784e -s ours
am: 4a8df64b10
Change-Id: Ia3b6b08bf38778ba4066c27d800caee21cc321d8
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions