diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 20:09:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 20:09:20 +0000 |
| commit | 2c5012c01205271d2e3e025adbd397fb2819891a (patch) | |
| tree | b5c1d8772d3f36a01fe5cd29ffe58338115080fd /annotations/generate_annotated_java_files.py | |
| parent | 3f33b89e1dc2d9df76269d1ed5deea5fd3639021 (diff) | |
| parent | b0c66c078b902aa3e7c7326c05c9a1276e52ccc3 (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
Change-Id: I6b6d448b5314c06486706320fe8786ea9bddf609
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions