Commits · 20637ba37f77d2521413d0b549509c2d4397a94d · halo / rockchip_libcore

16 Nov, 2016 40 commits

Merge "Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names."... · 20637ba3

Android Merger authored 8 years ago

Merge "Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names." into lollipop-cts-dev am: 7c504bff  -s ours am: df855148  -s ours" into marshmallow-cts-dev am: 78909a0a  -s ours" into nougat-cts-dev

20637ba3

Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names." into... · f2faa4fc

Android Merger authored 8 years ago

Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names." into lollipop-cts-dev am: 7c504bff  -s ours am: df855148  -s ours am: f52b0572  -s ours" into nougat-cts-dev

f2faa4fc

Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names." into... · c14fd2a3

Tina Zhou authored 8 years ago

Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names." into lollipop-cts-dev am: 7c504bff -s ours am: df855148 -s ours" into marshmallow-cts-dev
am: 78909a0a -s ours

Change-Id: Ib21207194c7c94906f91b108333a10bc9cf563d6

c14fd2a3

Merge "DO NOT MERGE IDN: Fix handling of long domain names." into... · d51960b7

Tina Zhou authored 8 years ago

Merge "DO NOT MERGE IDN: Fix handling of long domain names." into lollipop-cts-dev am: 7c504bff -s ours am: df855148 -s ours
am: f52b0572 -s ours

Change-Id: I0475b75cedd2e47b5a5e38e6e72837d1387884df

d51960b7

Merge "Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names. am:... · 1014c809

Android Merger authored 8 years ago

Merge "Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: bc48f871  -s ours" into lollipop-mr1-cts-dev am: fcd60194  -s ours" into marshmallow-cts-dev am: 361ff178  -s ours" into nougat-cts-dev

1014c809

Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names. am:... · 62d43f64

Android Merger authored 8 years ago

Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: bc48f871  -s ours" into lollipop-mr1-cts-dev am: fcd60194  -s ours am: 548cad53  -s ours" into nougat-cts-dev

62d43f64

Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names. am:... · ecf04699

Narayan Kamath authored 8 years ago

Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: bc48f871 -s ours" into lollipop-mr1-cts-dev am: fcd60194 -s ours" into marshmallow-cts-dev
am: 361ff178 -s ours

Change-Id: I4c19daf96f601ae93d90d6014c632d3d81c736b5

ecf04699

Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: -s... · 2053dabc

Narayan Kamath authored 8 years ago

Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: bc48f871 -s ours" into lollipop-mr1-cts-dev am: fcd60194 -s ours
am: 548cad53 -s ours

Change-Id: I82640d86c3598640723f40b1ad6fb0e0f0ccb90a

2053dabc

Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names. am:... · c4113fd2

Android Merger authored 8 years ago

Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: bc48f871  -s ours am: 70bfafe6  -s ours" into marshmallow-cts-dev am: bb1f9a08  -s ours" into nougat-cts-dev

c4113fd2

Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: -s... · 0947454a

Android Merger authored 8 years ago

Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: bc48f871  -s ours am: 70bfafe6  -s ours am: 72929bf4  -s ours" into nougat-cts-dev

0947454a

Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: -s... · f44e925a

Narayan Kamath authored 8 years ago

Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: bc48f871 -s ours am: 70bfafe6 -s ours" into marshmallow-cts-dev
am: bb1f9a08 -s ours

Change-Id: I723043cf4e3a3d5ad40ce27c4aafb431b76d9c54

f44e925a

DO NOT MERGE IDN: Fix handling of long domain names. am: -s ours... · e93a7386

Narayan Kamath authored 8 years ago

DO NOT MERGE IDN: Fix handling of long domain names. am: bc48f871  -s ours am: 70bfafe6  -s ours
am: 72929bf4  -s ours

Change-Id: I6e3991465a5c27487b083f814f8f659df509a318

e93a7386

Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names." into... · 78909a0a

Android Merger authored 8 years ago

Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names." into lollipop-cts-dev am: 7c504bff  -s ours am: df855148  -s ours" into marshmallow-cts-dev

78909a0a

Merge "DO NOT MERGE IDN: Fix handling of long domain names." into... · f52b0572

Tina Zhou authored 8 years ago

Merge "DO NOT MERGE IDN: Fix handling of long domain names." into lollipop-cts-dev am: 7c504bff  -s ours
am: df855148  -s ours

Change-Id: I3e2acd6f83304fb21b1515559cddda5b9553b23b

f52b0572

Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names. am:... · 361ff178

Android Merger authored 8 years ago

Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: bc48f871  -s ours" into lollipop-mr1-cts-dev am: fcd60194  -s ours" into marshmallow-cts-dev

361ff178

Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: -s... · bb1f9a08

Android Merger authored 8 years ago

Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: bc48f871  -s ours am: 70bfafe6  -s ours" into marshmallow-cts-dev

bb1f9a08

Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: -s... · 548cad53

Narayan Kamath authored 8 years ago

Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: bc48f871  -s ours" into lollipop-mr1-cts-dev
am: fcd60194  -s ours

Change-Id: I24707cde099a3a5fc54d9dc4cc49c77bba5227e7

548cad53

DO NOT MERGE IDN: Fix handling of long domain names. am: bc48f871 -s ours · 72929bf4
Narayan Kamath authored 8 years ago
```
am: 70bfafe6  -s ours

Change-Id: Ibdc68bf5fd528625728214c5256a2cc17e76ddbd
```
72929bf4
Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: bc48f871 -s... · fcd60194
Android Merger authored 8 years ago
```
Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: bc48f871  -s ours" into lollipop-mr1-cts-dev
```
fcd60194
Merge "DO NOT MERGE IDN: Fix handling of long domain names." into lollipop-cts-dev · df855148
Tina Zhou authored 8 years ago
```
am: 7c504bff  -s ours

Change-Id: I58a951810c97fba78e0bfe7c4c512f0e8d2dd641
```
df855148
DO NOT MERGE IDN: Fix handling of long domain names. · 70bfafe6
Narayan Kamath authored 8 years ago
```
am: bc48f871  -s ours

Change-Id: Ia4c30293acb691108eaf5a97ddfd3a849f22d59b
```
70bfafe6

Merge "Merge "Merge "DO NOT MERGE: Add tests for security vulnerability... · 3b83ec2b

Android Merger authored 8 years ago

Merge "Merge "Merge "DO NOT MERGE: Add tests for security vulnerability CVE-2016-0718" into lollipop-mr1-cts-dev am: a1203713  -s ours" into marshmallow-cts-dev am: f7b941ea  -s ours" into nougat-cts-dev

3b83ec2b

Merge "Merge "DO NOT MERGE: Add tests for security vulnerability... · 9b554504

Android Merger authored 8 years ago

Merge "Merge "DO NOT MERGE: Add tests for security vulnerability CVE-2016-0718" into lollipop-mr1-cts-dev am: a1203713  -s ours am: d0ad57c6  -s ours" into nougat-cts-dev

9b554504

Merge "Merge "DO NOT MERGE: Add tests for security vulnerability... · f04f060f

Tina Zhou authored 8 years ago

Merge "Merge "DO NOT MERGE: Add tests for security vulnerability CVE-2016-0718" into lollipop-mr1-cts-dev am: a1203713 -s ours" into marshmallow-cts-dev
am: f7b941ea -s ours

Change-Id: Ic15e6d5369274cd58de8c3ffb5aefbe9995350a9

f04f060f

Merge "DO NOT MERGE: Add tests for security vulnerability CVE-2016-0718" into... · c1941003

Tina Zhou authored 8 years ago

Merge "DO NOT MERGE: Add tests for security vulnerability CVE-2016-0718" into lollipop-mr1-cts-dev am: a1203713 -s ours
am: d0ad57c6 -s ours

Change-Id: I5dfdde8422c29ed391d59063d710ad2d78931d25

c1941003

Merge "Merge "DO NOT MERGE: Add tests for security vulnerability CVE-2016-0718... · 65ae3c57

Android Merger authored 8 years ago

Merge "Merge "DO NOT MERGE: Add tests for security vulnerability CVE-2016-0718 am: c14d69d8  -s ours" into marshmallow-cts-dev am: 21446c3a  -s ours" into nougat-cts-dev

65ae3c57

Merge "DO NOT MERGE: Add tests for security vulnerability CVE-2016-0718 am:... · 609dbdf9

Android Merger authored 8 years ago

Merge "DO NOT MERGE: Add tests for security vulnerability CVE-2016-0718 am: c14d69d8  -s ours am: 7dd7f639  -s ours" into nougat-cts-dev

609dbdf9

Merge "DO NOT MERGE: Add tests for security vulnerability CVE-2016-0718 am:... · e1e47f06

Paul Duffin authored 8 years ago

Merge "DO NOT MERGE: Add tests for security vulnerability CVE-2016-0718 am: c14d69d8 -s ours" into marshmallow-cts-dev
am: 21446c3a -s ours

Change-Id: I9e1474427574c939c41ec119a0a1bffbc94d08c0

e1e47f06

DO NOT MERGE: Add tests for security vulnerability CVE-2016-0718 am: c14d69d8 -s ours · c4caf92b
Paul Duffin authored 8 years ago
```
am: 7dd7f639  -s ours

Change-Id: I25b4e70bc037e53d2dedceb4cb6d582383d964f7
```
c4caf92b

Merge "Merge "Merge "IDN: Fix handling of long domain names." into... · 6287dcf0

Android Merger authored 8 years ago

Merge "Merge "Merge "IDN: Fix handling of long domain names." into lollipop-mr1-cts-dev am: a0b160e5" into marshmallow-cts-dev am: bbec8093" into nougat-cts-dev

6287dcf0

Merge "Merge "IDN: Fix handling of long domain names." into... · 064d0270

Android Merger authored 8 years ago

Merge "Merge "IDN: Fix handling of long domain names." into lollipop-mr1-cts-dev am: a0b160e5 am: b146258b" into nougat-cts-dev

064d0270

Merge "Merge "IDN: Fix handling of long domain names." into... · dceb136e

Tina Zhou authored 8 years ago

Merge "Merge "IDN: Fix handling of long domain names." into lollipop-mr1-cts-dev am: a0b160e5" into marshmallow-cts-dev
am: bbec8093

Change-Id: I00680b3473255cd86b8f44f34956af95c78f3370

dceb136e

Merge "IDN: Fix handling of long domain names." into lollipop-mr1-cts-dev am: a0b160e5 · 8d23ee90
Tina Zhou authored 8 years ago
```
am: b146258b

Change-Id: I3e6e623a1ee1919115972cdb2d3632be824db685
```
8d23ee90

Merge "Merge "IDN: Fix handling of long domain names. am: " into... · 6f82ad8c

Android Merger authored 8 years ago

Merge "Merge "IDN: Fix handling of long domain names. am: 3bae679e" into marshmallow-cts-dev am: eda7bce2" into nougat-cts-dev

6f82ad8c

Merge "IDN: Fix handling of long domain names. am: 3bae679e am: c9894aa8 " into nougat-cts-dev · 4b257771
Android Merger authored 8 years ago

4b257771
Merge "IDN: Fix handling of long domain names. am: 3bae679e" into marshmallow-cts-dev · a99116ba
Narayan Kamath authored 8 years ago
```
am: eda7bce2

Change-Id: If92caa945d1716a3ca051e6bcfb97d4651eb2389
```
a99116ba
IDN: Fix handling of long domain names. am: 3bae679e · f5fc419c
Narayan Kamath authored 8 years ago
```
am: c9894aa8

Change-Id: I046b59e83b47205202088346a9eddf9cc0419b17
```
f5fc419c

Merge "Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718"... · b5416e4b

Android Merger authored 8 years ago

Merge "Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718" into marshmallow-cts-dev am: 3bc9de39  -s ours" into nougat-cts-dev

b5416e4b

Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718 am:... · 57d501a7
Android Merger authored 8 years ago
```
Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718 am: 3d3f0a44  -s ours" into nougat-cts-dev
```
57d501a7
Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718" into marshmallow-cts-dev · 2fa15427
Tina Zhou authored 8 years ago
```
am: 3bc9de39  -s ours

Change-Id: I3edebd935872587e6805615ab49fc7ba35e55a05
```
2fa15427