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 | 23f3955218720f9dab6abdadc33f6ac48d9b0e8a (patch) | |
| tree | ce25c28163ad9d9ea9809cdbae0ce097ea5bc07c /annotations/generate_annotated_java_files.py | |
| parent | 8da42797516bf606e868faf34274be40e6610f2f (diff) | |
| parent | 548cad532e28479aa5fe267b0a51871625a02f25 (diff) | |
Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: bc48f87162 -s ours" into lollipop-mr1-cts-dev am: fcd60194c2 -s ours
am: 548cad532e -s ours
Change-Id: If9d77589df1cebf3173f3f61ad474ba0a9746d23
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions