Android Build Merger (Role)
7fc94d02ca
Merge changes from topic "am-0ac6ccf47239465e9891c4d8b9d8f076" into oc-dev
...
* changes:
[automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7a2002d1824c53324ff49d599ee0f6c8c4e8c715d46b33d45f7a2002d1824c53324ff49d599ee0f6c8c4e8c715d46b33d45f7a2002d1824c53324ff49d599ee0f6c46b33d45f7a2002d1824c53324ff4946b33d45f7a2002d18242af33bcc3ee9ec3eb83b49581046e44986062ed32af33bcc3ee9ec3eb83b49581046e44986062ed32af33bcc3ee9ec3eb83b49581046e42af33bcc3ee9ec3eb83b2af33bcc3e46b33d45f7
2018-04-09 22:49:06 +00:00
Ray Essick
51fa4a4cc9
Merge changes from topic "asb-2018-04-o" into oreo-cts-dev
...
am: 6977a333a5
2018-04-09 15:47:04 -07:00
Ray Essick
81c482bdd4
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454
...
am: ae91a6ad6f -s ours
Change-Id: I8b3d556e7db65421f5a9d022428cecf541367e36
2018-04-09 15:46:43 -07:00
Android Build Merger (Role)
f2aeff9120
Merge "Merge changes from topic "am-a984919964a248a18190aca22d4db916" into oreo-cts-dev am: 0eeb6c53d1" into oc-dev
2018-04-09 22:45:03 +00:00
Android Build Merger (Role)
50988d78ff
Merge "[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours am: 8dd2d10a1b -s ours" into oc-dev
2018-04-09 22:44:57 +00:00
Ray Essick
85a85e7f60
Merge changes from topic "am-a984919964a248a18190aca22d4db916" into oreo-cts-dev
...
am: 0eeb6c53d1
2018-04-09 15:44:38 -07:00
Android Build Merger (Role)
13add74a8e
[automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824 am: c53324ff49 am: d599ee0f6c am: 8c4e8c715d am: d23573db37
...
Change-Id: I391dd9a42dbf8b018a36a1d5438bdf79a0ff3a84
2018-04-09 22:44:29 +00:00
Android Build Merger (Role)
8c4e8c715d
[automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824 am: c53324ff49 am: d599ee0f6c
...
Change-Id: I53c7b8443006ee10731ca9042526ec539fc23078
2018-04-09 22:44:21 +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)
23be4acd42
[automerger] Merge changes from topic "asb-2018-04-n1" into nougat-mr1-cts-dev am: 34ef78f44f am: f727768aa7 am: b5c3ab95a8 am: efcf101cf2
...
Change-Id: Ia2a7b09dc5ea0e9ef306a2d9956a42d06363498d
2018-04-09 22:44:05 +00:00
Android Build Merger (Role)
b5c3ab95a8
[automerger] Merge changes from topic "asb-2018-04-n1" into nougat-mr1-cts-dev am: 34ef78f44f am: f727768aa7
...
Change-Id: If7be053b905cd763f1aa7b50e5d4b1c91cb86255
2018-04-09 22:43:57 +00:00
Ray Essick
eb9dd8fcfd
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours
...
am: 8dd2d10a1b
2018-04-09 15:43:44 -07:00
Android Build Merger (Role)
b811a14ec7
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours skipped: 2af33bcc3e skipped: e9ec3eb83b skipped: 49581046e4 skipped: 4986062ed3 skipped: 9b1b7bc603
...
Change-Id: I3863fb6ce4b6d540437d2afee718d390225928a8
2018-04-09 22:43:19 +00:00
Android Build Merger (Role)
0c883452f2
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours skipped: d4d28bcb12 skipped: 948813147b skipped: 1cd8984784
...
Change-Id: I4a4a7e805cde5a422b384b1887d0e0dff01b941d
2018-04-09 22:43:14 +00:00
Android Build Merger (Role)
4986062ed3
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours skipped: 2af33bcc3e skipped: e9ec3eb83b skipped: 49581046e4
...
Change-Id: I00a65994b1e7f5abddd95472da44f301b142ffbb
2018-04-09 22:42:55 +00:00
Android Build Merger (Role)
948813147b
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours skipped: d4d28bcb12
...
Change-Id: Ibfa3a3e072b7003e602018aec609cba191138534
2018-04-09 22:42:52 +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
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
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
Treehugger Robot
6977a333a5
Merge changes from topic "asb-2018-04-o" into oreo-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
DO NOT MERGE Camera: Add test for OutputConfiguration parcelling
2018-04-09 22:30:37 +00:00
Android Merger
0eeb6c53d1
Merge changes from topic "am-a984919964a248a18190aca22d4db916" into oreo-cts-dev
...
* changes:
Merge changes from topic "asb-2018-04-n1" into nougat-mr1-cts-dev am: 34ef78f44f
2018-04-09 22:28:05 +00:00
Ray Essick
a1d6d60e04
Merge changes from topic "asb-2018-04-n1" into nougat-mr1-cts-dev
...
am: 34ef78f44f
2018-04-09 15:27:50 -07:00
Ray Essick
8dd2d10a1b
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454
...
am: 8a0f955e56 -s ours
Change-Id: Ib3da591114c4022fb94114f768d0ecf3f5c106b1
2018-04-09 15:27:27 -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
ed78bcf07e
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:44 -07: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
Android Build Merger (Role)
ea75ff0609
[automerger] Add CTS test for URI fix. am: 85156429a2 am: 27914625b1 am: 662ce9724a am: 67ae9d3245 am: ad9fa4877c am: 2f52ceef6f am: 3bc75c3136 am: 1e65404eb8 am: 330b09b8a8 am: 119bbb1cdb
...
Change-Id: Ib52e5a020d679328e9d91534e636f6f89abb8781
2018-01-31 11:17:54 +00:00
Android Build Merger (Role)
330b09b8a8
[automerger] Add CTS test for URI fix. am: 85156429a2 am: 27914625b1 am: 662ce9724a am: 67ae9d3245 am: ad9fa4877c am: 2f52ceef6f am: 3bc75c3136 am: 1e65404eb8
...
Change-Id: I0232e8093dd78ed98e9d89ec0c062593b38a12a1
2018-01-31 11:17:45 +00: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 Build Merger (Role)
808e81dd22
[automerger] Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev am: 5962c9a234 am: b4bfd2591e am: eac2219dc5 am: db6090eaf9
...
Change-Id: I6bc6a23c88ad0e6128fc31278f4a206a78652926
2018-01-17 03:23:56 +00:00
Android Build Merger (Role)
eac2219dc5
[automerger] Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev am: 5962c9a234 am: b4bfd2591e
...
Change-Id: I120eb44d9d2d125a39e126cb352c647957f7c3d6
2018-01-17 03:23:48 +00:00
Android Build Merger (Role)
6b4982ab84
[automerger] 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 am: 0929932c4e am: 265bcb72d4 skipped: 817433c874
...
Change-Id: I62e9a641654b924112701fb7c079d32e8c1e9f88
2018-01-17 03:22:57 +00:00
Android Build Merger (Role)
265bcb72d4
[automerger] 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 am: 0929932c4e
...
Change-Id: If961faa8b8cd48133480340db402be74a138351a
2018-01-17 03:22:50 +00:00
Android Merger
b4bfd2591e
Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev
...
am: 5962c9a234
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
2018-01-17 03:19:45 +00:00
Android Build Merger (Role)
94583cc2fa
[automerger] Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev am: f582e9dede am: 02c0ecc53d am: af696171be am: b986143870 am: 7f4a3db8e5 am: f6cfb759d4
...
Change-Id: I06afa7a3a2607550bf3dcc2a7ec337c92a58fff6
2018-01-17 02:46:11 +00:00
Android Build Merger (Role)
7f4a3db8e5
[automerger] Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev am: f582e9dede am: 02c0ecc53d am: af696171be am: b986143870
...
Change-Id: I3844fb6083799d1975c43644b66c69ec5611283e
2018-01-17 02:46:03 +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
