diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 20:18:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 20:18:36 +0000 |
| commit | 009a9db28fbbab75b3a36690e1f97cebed277e4d (patch) | |
| tree | 6599c2c072eb9b26d6ca9e7f068e59c8065a4831 /annotations/generate_annotated_java_files.py | |
| parent | 622aa39951d63649c2bd22878198ee46f06541be (diff) | |
| parent | 2c5012c01205271d2e3e025adbd397fb2819891a (diff) | |
Merge "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" into marshmallow-cts-dev am: 2a9d9de7ca -s ours am: 5653ca462e am: 6e0f728c18 am: 648b25e530 am: b0c66c078b -s ours
am: 2c5012c012
Change-Id: I6207f14a528dcdd50ad491929ac9aae80ded9ce1
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions