diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 20:09:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 20:09:06 +0000 |
| commit | 3f33b89e1dc2d9df76269d1ed5deea5fd3639021 (patch) | |
| tree | b5c1d8772d3f36a01fe5cd29ffe58338115080fd /annotations/generate_annotated_java_files.py | |
| parent | 0f219d7fa7c5e1c0fd8b23e686663a27722883dc (diff) | |
| parent | a8d99cb8ecb6780fa2b61fb45da185b6737b2d2b (diff) | |
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 am: 2b20489d39 -s ours am: 94ac2d84d8 am: fd69f64932 am: b6bb3dfc52
am: a8d99cb8ec -s ours
Change-Id: I658e9f619192b985a6809c7d722fed8c90abc66d
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions