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