diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 20:01:26 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 20:01:26 +0000 |
| commit | b0c66c078b902aa3e7c7326c05c9a1276e52ccc3 (patch) | |
| tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
| parent | a8d99cb8ecb6780fa2b61fb45da185b6737b2d2b (diff) | |
| parent | 648b25e530103a833a46db2943ba7f9a05256ac5 (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
Change-Id: I6274cb59254e55c8b085f98083a7ee6f7fe34b1c
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions