diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:46:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:46:23 +0000 |
| commit | 6e0f728c18ebf69f711586f45945c07613baf8d7 (patch) | |
| tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
| parent | fd69f64932d779fd08447d0724274025eeb9acbb (diff) | |
| parent | 5653ca462e6aa4d8018ce54696a0f6315710a631 (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
Change-Id: I87ac0416dec0f829fde050e70f9a32df044588ec
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions