diff options
| author | Narayan Kamath <narayan@google.com> | 2016-11-16 19:31:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:31:54 +0000 |
| commit | 4a8df64b10d8a96f933bfd307a1fc2f1a80d0ba3 (patch) | |
| tree | ce25c28163ad9d9ea9809cdbae0ce097ea5bc07c /annotations/generate_annotated_java_files.py | |
| parent | 23f3955218720f9dab6abdadc33f6ac48d9b0e8a (diff) | |
| parent | 361ff1784ec5f3f89b9050039044377afb9fd3c3 (diff) | |
Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: bc48f87162 -s ours" into lollipop-mr1-cts-dev am: fcd60194c2 -s ours" into marshmallow-cts-dev
am: 361ff1784e -s ours
Change-Id: I6be81462c222743686b12bca29d6902a59eae2fc
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions