diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:01:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:01:57 +0000 |
| commit | 8179d6635082bc69a3a529cce52e3d02848c886f (patch) | |
| tree | ce25c28163ad9d9ea9809cdbae0ce097ea5bc07c /annotations/generate_annotated_java_files.py | |
| parent | 166b2e84f86eef129e3538d600a8a58c78d25efa (diff) | |
| parent | bbec80932ce8767b765026ed086ea084c33f3c2f (diff) | |
Merge "Merge "IDN: Fix handling of long domain names." into lollipop-mr1-cts-dev am: a0b160e5f3" into marshmallow-cts-dev
am: bbec80932c
Change-Id: I6c3baddfd4be53d0041104949ebf5b86280852f0
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions