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