diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:17:02 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:17:02 +0000 |
| commit | 2b20489d39d91c5ece907bd3c1d2e925be5cb44c (patch) | |
| tree | 3670478a4ffbad48469ff0a538eb7fb7913bb3b2 /annotations/generate_annotated_java_files.py | |
| parent | f52b0572562c897f6cd7f66f10955d50ddf58f8d (diff) | |
| parent | a1b430d8416c55144b8aa50ff996797064c74995 (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
Change-Id: If8a835201427ff1583d2f5158d23bf582f3336b1
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions