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
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
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
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
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)
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
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
2018-04-09 16:54:52 -07: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)
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
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
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
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
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
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)
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
a2002d1824
Merge changes from topic "asb-2018-04-n" into nougat-cts-dev
...
am: 46b33d45f7
2018-04-09 15:42:15 -07:00
Ray Essick
2af33bcc3e
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454
...
am: b32ca8fa74 -s ours
Change-Id: I8e032bcbf55d459d9d28bb762203012ace5b1e6a
2018-04-09 15:42:03 -07:00
Treehugger Robot
46b33d45f7
Merge changes from topic "asb-2018-04-n" into nougat-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 22:23:16 +00:00
Adam Vartanian
1c7d94f2f7
DO NOT MERGE Add CTS test for URI fix.
...
Bug: 71360761
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: I09a156040d4970b7b2f973e9bffcfc97a8ff2274
(cherry picked from commit 85156429a2
2018-04-09 14:45:37 -07:00
Adam Vartanian
ac7531ccb4
DO NOT MERGE Add CTS test for URI fix.
...
Bug: 71360761
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: I09a156040d4970b7b2f973e9bffcfc97a8ff2274
(cherry picked from commit 85156429a2
2018-04-09 14:43:20 -07:00
Android Build Merger (Role)
3bc75c3136
[automerger] Add CTS test for URI fix. am: 85156429a2 am: 27914625b1 am: 662ce9724a am: 67ae9d3245 am: ad9fa4877c am: 2f52ceef6f
...
Change-Id: I164c155385cef9ca2ed8bb810d1c1e7be65e4458
2018-01-31 11:17:34 +00:00
Android Build Merger (Role)
2f52ceef6f
[automerger] Add CTS test for URI fix. am: 85156429a2 am: 27914625b1 am: 662ce9724a am: 67ae9d3245 am: ad9fa4877c
...
Change-Id: Ie5d7744787cd7b700b42dc22ddc921f5b1965a01
2018-01-31 11:17:29 +00:00
Android Build Merger (Role)
67ae9d3245
[automerger] Add CTS test for URI fix. am: 85156429a2 am: 27914625b1 am: 662ce9724a
...
Change-Id: I29da2e67aa8c3ec9bde0d72c91ada85f160e39d9
2018-01-31 11:17:19 +00:00
Android Build Merger (Role)
27914625b1
[automerger] Add CTS test for URI fix. am: 85156429a2
...
Change-Id: Iedd07e900b8512737df2d0d6ca33920ef9bfd30b
2018-01-31 11:17:09 +00:00
Adam Vartanian
85156429a2
Add CTS test for URI fix.
...
Bug: 71360761
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: I09a156040d4970b7b2f973e9bffcfc97a8ff2274
2018-01-31 10:47:13 +00:00
Android Build Merger (Role)
af696171be
[automerger] Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev am: f582e9dede am: 02c0ecc53d
...
Change-Id: I28da24aaf125a8ada71b760c42e03ad7bef5bfcf
2018-01-17 02:45:55 +00:00
Android Build Merger (Role)
a8a391899f
[automerger] DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 3ba9598f23
...
Change-Id: I4b5d6970b199efd861d25633abd0433446ca1304
2018-01-17 02:44:37 +00:00
Android Merger
02c0ecc53d
Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev
...
am: f582e9dede
2018-01-17 02:44:23 +00:00
Adam Vartanian
3ba9598f23
DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours
...
am: 84a9da7ac9
2018-01-17 02:42:57 +00:00
Android Build Merger (Role)
d504634c49
[automerger] DO NOT MERGE: Fix issue of also adding "<packge>2" am: 9abf6a313b am: 83c8faf6d9 am: ffed9269ba skipped: 8a8bebe6a1 am: b9a731a6c9
...
Change-Id: Ice6945e3f3c9910922c8bc6c61cb1e9f2aba647c
2018-01-16 21:43:19 +00:00
Android Build Merger (Role)
b9a731a6c9
[automerger] DO NOT MERGE: Fix issue of also adding "<packge>2" am: 9abf6a313b am: 83c8faf6d9 am: ffed9269ba skipped: 8a8bebe6a1
...
Change-Id: I5d3d4f63359eec49e4d57613ff6c7c77d7377d6e
2018-01-16 21:43:15 +00:00
Android Merger
f582e9dede
Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev
...
* changes:
Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev am: 27e23e96ca36c5e0d87f181a10e364
2018-01-16 21:28:42 +00:00
Android Merger
2d8bad1b3b
Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev
...
am: 27e23e96ca
2018-01-16 21:28:30 +00:00
Adam Vartanian
84a9da7ac9
DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours
...
am: 181a10e364
2018-01-16 21:27:42 +00:00
Android Merger
edf8250d28
Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev am: 27e23e96ca am: 326fcb43e5
...
am: e98d4f9f59
Change-Id: I8c851ce455f33edf9b949769c409f9484d905500
2018-01-12 00:17:09 +00:00
Adam Vartanian
eb712f2808
DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 18e3114317
...
am: b7a93eb721
Change-Id: I758fa1d489e64c82465443cc6f91a23673060d7d
2018-01-12 00:16:34 +00:00
Android Merger
326fcb43e5
Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev
...
am: 27e23e96ca
2018-01-12 00:08:17 +00:00
