diff options
| author | Narayan Kamath <narayan@google.com> | 2016-11-16 19:31:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:31:32 +0000 |
| commit | 8da42797516bf606e868faf34274be40e6610f2f (patch) | |
| tree | ce25c28163ad9d9ea9809cdbae0ce097ea5bc07c /annotations/generate_annotated_java_files.py | |
| parent | 35bc65d53a4e7b4639b6825b24306d8e9d428283 (diff) | |
| parent | bb1f9a08da6a15579703de27c9c6dc8bc4696c46 (diff) | |
Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: bc48f87162 -s ours am: 70bfafe61c -s ours" into marshmallow-cts-dev
am: bb1f9a08da -s ours
Change-Id: Ibce18186f861f2ed494ac59b9e4fe5c77a3eec28
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions