Android Build Merger (Role)
e386847db3
[automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76
...
Change-Id: If285f192d8078cd4934e6700b3b6a535185f1b53
2019-07-08 19:23:59 +00:00
Android Build Merger (Role)
8e99f9ef76
[automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5
...
Change-Id: I03f5b6a01337158727e56ad60a79d9f2a87daf7e
2019-07-08 19:23:55 +00:00
Android Build Merger (Role)
047d1a9ed5
[automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4
...
Change-Id: I0669f124ad6d84592053ac199c7fd1831fb8f7d3
2019-07-08 19:23:50 +00:00
Android Build Merger (Role)
cbc0a6b066
[automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c
...
Change-Id: I3611dbe31a1c1d42c22549e065dce570e97bada3
2019-07-08 19:23:45 +00:00
Lorenzo Colitti
e6ced2f716
Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev
...
am: dd55552460
Change-Id: I6f2775a58f5c72effd7d04e031abb61df569dbb3
2019-07-08 12:23:07 -07:00
Treehugger Robot
dd55552460
Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev
2019-07-08 18:39:08 +00:00
Lorenzo Colitti
86d07d0147
Fix expected reverse lookup of Google DNS IP addresses
...
DnsTest.testDnsWorks expects that reverse lookup for the Google
public DNS servers will return something with google.com in the
name. This no longer works because the reverse DNS entries have
changed to dns.google.
Bug: 129452237
Test: atest android.net.cts.DnsTest.testDnsWorks
Change-Id: Iee8bfe418bf6003e5c78df77d75f6f9745249267
Merged-In: Iee8bfe418bf6003e5c78df77d75f6f9745249267
(cherry picked from commit 3852fd92f5 )
2019-07-03 13:47:01 +09:00
Lorenzo Colitti
1b50f30867
[automerger skipped] Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev
...
am: 50491fb1cc -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history
Change-Id: I1d5e16687c38854c60aee253b9ac2b01750e6985
2019-04-08 17:25:56 -07:00
Android Merger
50491fb1cc
Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev
2019-04-08 23:32:07 +00:00
Lorenzo Colitti
fe13c7233d
Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev
...
am: 3b416dd354
Change-Id: I03a2f6f3631c25868d504892c5b885477dcfeb01
2019-04-08 16:31:57 -07:00
Android Build Merger (Role)
9c3250f49c
[automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354 am: d4831efbe0 am: 88a48fcbfe
...
Change-Id: I100af07ea8c391545d48b6b8888696a3622b54ec
2019-04-08 23:26:23 +00:00
Android Build Merger (Role)
88a48fcbfe
[automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354 am: d4831efbe0
...
Change-Id: Ie85fee065ec9aef98036b75bf1b2497d760b8070
2019-04-08 23:26:20 +00:00
Lorenzo Colitti
d4831efbe0
Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev
...
am: 3b416dd354
Change-Id: I0228552c2231e0d2241e3c417e1ac5fe2495e619
2019-04-08 16:26:02 -07:00
Treehugger Robot
3b416dd354
Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev
2019-04-08 22:33:39 +00:00
Lorenzo Colitti
3a984ca812
Fix expected reverse lookup of Google DNS IP addresses
...
DnsTest.testDnsWorks expects that reverse lookup for the Google
public DNS servers will return something with google.com in the
name. This no longer works because the reverse DNS entries have
changed to dns.google.
Bug: 129452237
Test: atest android.net.cts.DnsTest.testDnsWorks
Change-Id: Iee8bfe418bf6003e5c78df77d75f6f9745249267
Merged-In: Iee8bfe418bf6003e5c78df77d75f6f9745249267
(cherry picked from commit 3852fd92f5 )
2019-04-08 00:21:48 +00:00
Ray Essick
1ce0bfba89
Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev
...
am: 8ef12d94da
Change-Id: I1ff3b3086d7890ed1691cdd2821c76680fd152c4
2018-04-09 17:09:35 -07:00
Ray Essick
d033198a42
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours
...
am: bafd18446f -s ours
Change-Id: Ib90a3db2bb775bd0ba9024fdafd7f7b498c808f3
2018-04-09 17:05:38 -07:00
Android Build Merger (Role)
02cf01f51c
[automerger] Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d am: e451b4062e am: c2f39f64b5
...
Change-Id: Iea5d02461fb181773d87e87cecae8ebd7fa4dfe3
2018-04-09 23:57:55 +00:00
Android Build Merger (Role)
c2f39f64b5
[automerger] Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d am: e451b4062e
...
Change-Id: If5d1bb2ea504d9ca25a661e49eeb68274e02735c
2018-04-09 23:57:51 +00:00
Android Build Merger (Role)
8b6d971588
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours skipped: 868997117d skipped: a4cf60e6ea
...
Change-Id: If7186d1a551c931e37ce6481f60bff81ffc3ba9f
2018-04-09 23:56:58 +00:00
Android Build Merger (Role)
a4cf60e6ea
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours skipped: 868997117d
...
Change-Id: Iac9c8c8265809970e40abcdeb1600db0bd537df2
2018-04-09 23:56:54 +00:00
Ray Essick
e451b4062e
Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev
...
am: 1fd90c968d
Change-Id: I419475c5ec1b574b27e3886e8b814896b052e338
2018-04-09 16:56:40 -07:00
Ray Essick
868997117d
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours
...
am: afb3e84599 -s ours
Change-Id: If2935b3a343ee90d21992e50f2f6a3d8e698fa39
2018-04-09 16:54:52 -07:00
Android Build Merger (Role)
d27bde6edf
[automerger] Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8 am: 6d52324524 am: 87ad8f6dcb am: 70171fe46e am: 6035791a0f am: c0ca2003bc am: c4691f5ad5
...
Change-Id: I8293081120821576357af0be19381165591881ec
2018-04-09 23:49:04 +00:00
Android Build Merger (Role)
c4691f5ad5
[automerger] Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8 am: 6d52324524 am: 87ad8f6dcb am: 70171fe46e am: 6035791a0f am: c0ca2003bc
...
Change-Id: I6c2503296ecba421bd2da55ff5f3fbe816df9de4
2018-04-09 23:49:01 +00:00
Android Build Merger (Role)
c0ca2003bc
[automerger] Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8 am: 6d52324524 am: 87ad8f6dcb am: 70171fe46e am: 6035791a0f
...
Change-Id: I41f38c1c453af0ee29016cb1dd8fcf391a7563eb
2018-04-09 23:48:56 +00:00
Android Build Merger (Role)
70171fe46e
[automerger] Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8 am: 6d52324524 am: 87ad8f6dcb
...
Change-Id: I3d0bb181be9a6850c04c414c00caa34357af64c2
2018-04-09 23:48:48 +00:00
Android Build Merger (Role)
cd9a559fd2
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours skipped: 151750d842 skipped: d1811f0384 skipped: bbfa5d23a9 skipped: c407f8968b skipped: 6fc9eb97c5 skipped: 973a5cd865
...
Change-Id: I86e659f378ea19e8214b48018660f1aaa9e25452
2018-04-09 23:47:19 +00:00
Android Build Merger (Role)
973a5cd865
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours skipped: 151750d842 skipped: d1811f0384 skipped: bbfa5d23a9 skipped: c407f8968b skipped: 6fc9eb97c5
...
Change-Id: I9aa2873c7effd36f674820e9360295037f245d5d
2018-04-09 23:47:16 +00:00
Android Build Merger (Role)
6fc9eb97c5
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours skipped: 151750d842 skipped: d1811f0384 skipped: bbfa5d23a9 skipped: c407f8968b
...
Change-Id: I6eddf6d473cbc1a4c9aa622b28cd147d3d5ce354
2018-04-09 23:47:09 +00:00
Android Build Merger (Role)
bbfa5d23a9
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours skipped: 151750d842 skipped: d1811f0384
...
Change-Id: Iab81c84291e17c1124aa3e02f6a53515585a11e7
2018-04-09 23:47:01 +00:00
Ray Essick
6d52324524
Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev
...
am: 7f0c5e7da8
Change-Id: I78b882d59e9587efec84b735d48e58369764eba8
2018-04-09 16:46:34 -07:00
Ray Essick
151750d842
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454
...
am: 2215338715 -s ours
Change-Id: Ie4d139a1eb1c5fc6506bb79861ffe81fed7c0157
2018-04-09 16:46:17 -07:00
Android Merger
8ef12d94da
Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev
...
* changes:
Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours
2018-04-09 23:43:56 +00:00
Ray Essick
dfc472585a
Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev
...
am: 1fd90c968d
Change-Id: I19327405fc5eb081741a140637b531b265683ce7
2018-04-09 16:43:45 -07:00
Ray Essick
bafd18446f
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours
...
am: afb3e84599 -s ours
Change-Id: Iefbef63bc6c5cd09ce6b949f31e8a3fd8c822a15
2018-04-09 16:41:51 -07:00
Android Merger
1fd90c968d
Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev
...
* changes:
Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours
2018-04-09 23:33:47 +00:00
Ray Essick
bcd58bb50a
Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev
...
am: 7f0c5e7da8
Change-Id: I1db217fe93ba600f5a732aa8418705f2133af020
2018-04-09 16:33:28 -07:00
Ray Essick
afb3e84599
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454
...
am: 2215338715 -s ours
Change-Id: I9d60b68be04ed4f32a782ba09f406b2953f4938b
2018-04-09 16:33:05 -07:00
Treehugger Robot
7f0c5e7da8
Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev
...
* changes:
DO NOT MERGE CTS for presence of avc fix for b/70897454
DO NOT MERGE Add CTS test for URI fix.
DO NOT MERGE CTS additions for b/72165027
DO NOT MERGE CTS tests for b/70897394
2018-04-09 23:26:06 +00:00
Ray Essick
27b937e5fc
Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev
...
am: 36b9badd7a
Change-Id: I95af41e36a50a3f83b53dda7348e3dfd1cf93d64
2018-04-09 15:59:56 -07:00
Ray Essick
1cdd92daaa
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours
...
am: 81f274ebb2 -s ours
Change-Id: If52edfd7ab1fa83debd3b1725b8e449f38017ad6
2018-04-09 15:57:27 -07:00
Android Build Merger (Role)
b47089d6e3
Merge changes from topic "am-0ac6ccf47239465e9891c4d8b9d8f076" into nyc-mr1-dev
...
* changes:
[automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824 am: c53324ff49
[automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours skipped: 2af33bcc3e skipped: e9ec3eb83b
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours skipped: 2af33bcc3e
Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours
2018-04-09 22:49:06 +00:00
Android Build Merger (Role)
d599ee0f6c
[automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824 am: c53324ff49
...
Change-Id: I206b95f604d783f54bac9957a030a9335dfdfe4f
2018-04-09 22:44:18 +00:00
Android Build Merger (Role)
c53324ff49
[automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824
...
Change-Id: Ic6d9fab85f79423e2543caab1d8fd398adbd2e5d
2018-04-09 22:44:14 +00:00
Android Build Merger (Role)
49581046e4
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours skipped: 2af33bcc3e skipped: e9ec3eb83b
...
Change-Id: I341e65171de119f34d348231b977aa704142563d
2018-04-09 22:42:39 +00:00
Android Build Merger (Role)
e9ec3eb83b
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours skipped: 2af33bcc3e
...
Change-Id: If878840fc1cd762b9a10deb3ff0e05de0f753451
2018-04-09 22:42:31 +00:00
Ray Essick
f727768aa7
Merge changes from topic "asb-2018-04-n1" into nougat-mr1-cts-dev
...
am: 34ef78f44f
Change-Id: Ibda5cebb569720eae6fa4001a774a13d99ebf04b
2018-04-09 15:42:22 -07:00
Ray Essick
a2002d1824
Merge changes from topic "asb-2018-04-n" into nougat-cts-dev
...
am: 46b33d45f7
Change-Id: Iae1309a64a877bb2965e2bb407206cd0e891e44e
2018-04-09 15:42:15 -07:00
Ray Essick
d4d28bcb12
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454
...
am: 8a0f955e56 -s ours
Change-Id: I0024538a8e58264b11b0573881e8c2e30191b3b2
2018-04-09 15:42:07 -07:00