Commit Graph

1050 Commits

Author SHA1 Message Date
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
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
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
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
Android Merger
36b9badd7a Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev
* changes:
  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:27:52 +00:00
Ray Essick
c5f84ae68a Merge changes from topic "asb-2018-04-n" into nougat-cts-dev
am: 46b33d45f7

Change-Id: I83085ac2acf75df0557abac0118e0654c533ce28
2018-04-09 15:27:40 -07:00
Ray Essick
81f274ebb2 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454
am: b32ca8fa74  -s ours

Change-Id: Id298dfba4969b5b1555a557fee67bb0e0a91ea7c
2018-04-09 15:27:23 -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
Treehugger Robot
34ef78f44f Merge changes from topic "asb-2018-04-n1" into nougat-mr1-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:21:52 +00:00
Adam Vartanian
55c6004dfd 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:46:11 -07: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)
1e65404eb8 [automerger] Add CTS test for URI fix. am: 85156429a2 am: 27914625b1 am: 662ce9724a am: 67ae9d3245 am: ad9fa4877c am: 2f52ceef6f am: 3bc75c3136
Change-Id: I3e58d87b69ba1f32474550364e04324e6fc8fd88
2018-01-31 11:17:39 +00: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 Merger
b4bfd2591e Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev
am: 5962c9a234

Change-Id: I2193a17eb99173895f9397d18d8361e1eb4568d6
2018-01-17 03:22:22 +00:00
Adam Vartanian
0929932c4e DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours
am: 9dc912e515  -s ours

Change-Id: I08182d4ead353c8fe59d54bac007586c6fa91b1d
2018-01-17 03:19:45 +00:00
Android Build Merger (Role)
b986143870 [automerger] Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev am: f582e9dede am: 02c0ecc53d am: af696171be
Change-Id: I475e52bc05a9a602cb8d99fbf1468832686b69c0
2018-01-17 02:45:59 +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)
16b7318a02 [automerger] DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 3ba9598f23 am: a8a391899f
Change-Id: I7df1041d1cd9f582534af512a99774288d41d4eb
2018-01-17 02:44:40 +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

Change-Id: Ie9702984ab2e7a3d90ce0237d5c5593446d4b664
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  -s ours

Change-Id: Ic32802e983f9a464d629873909380682f3fb2c34
2018-01-17 02:42:57 +00:00
Android Build Merger (Role)
464b0360d7 [automerger] DO NOT MERGE: Fix issue of also adding "<packge>2" am: 9abf6a313b am: 83c8faf6d9 am: ffed9269ba skipped: 8a8bebe6a1 am: b9a731a6c9 am: d504634c49
Change-Id: I0444212f97b92755ef9f52f973e4dd2fde494d04
2018-01-16 21:43:22 +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