Android Build Merger (Role)
fbc9d49796
[automerger] Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev am: 36b9badd7a am: 27b937e5fc am: 8c0df95444 am: 0c19a15081
...
Change-Id: Ic5b143f37eb1d0655f279e3b16630327e4694b50
2018-04-09 23:01:32 +00:00
Android Build Merger (Role)
0c19a15081
[automerger] Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev am: 36b9badd7a am: 27b937e5fc am: 8c0df95444
...
Change-Id: If9bc5987bc69873e2e83f2f09e69c9717c87d92b
2018-04-09 23:01:29 +00:00
Android Build Merger (Role)
8c0df95444
[automerger] Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev am: 36b9badd7a am: 27b937e5fc
...
Change-Id: I535c691ff90da57c09e9c9072908e445846612d9
2018-04-09 23:01:26 +00:00
Android Build Merger (Role)
d2e50eb968
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours skipped: 1cdd92daaa skipped: 7a92b9afdb skipped: 849e67fad2
...
Change-Id: Id7d5a669fb0c542b6ab530e6c1930318c7c84ca2
2018-04-09 23:00:36 +00:00
Android Build Merger (Role)
849e67fad2
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours skipped: 1cdd92daaa skipped: 7a92b9afdb
...
Change-Id: Ib0b195b2f7635d26d467eb8a5669476cb21bc9a4
2018-04-09 23:00:24 +00:00
Android Build Merger (Role)
7a92b9afdb
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours skipped: 1cdd92daaa
...
Change-Id: I624e926842a0e35b34e38e19e109d62653cb1e2a
2018-04-09 23:00:20 +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
5b5f73c2e8
Merge changes from topic "am-4267ce935a9849bdbcbcc7e45cbacd34" into oreo-cts-dev
...
am: 1c90ff8dcf
Change-Id: I0856e123ead2e4b075c693f68874354e51572988
2018-04-09 15:58:56 -07:00
Ray Essick
c1a7ce019c
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours
...
am: 308f60a04c -s ours
Change-Id: Icdb4c482157fdff88c35ae2a92bc8ca92481b592
2018-04-09 15:57:47 -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)
b27a56cf6f
Merge changes from topic "am-0ac6ccf47239465e9891c4d8b9d8f076" into nyc-mr2-dev
...
* changes:
[automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824 am: c53324ff49 am: d599ee0f6c am: 8c4e8c715d
[automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824 am: c53324ff49 am: d599ee0f6c
[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 skipped: 49581046e4 skipped: 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
[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)
ce6bd73430
Merge changes from topic "am-0ac6ccf47239465e9891c4d8b9d8f076" into cw-f-dev
...
* changes:
[automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824 am: c53324ff49 am: d599ee0f6c
[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 skipped: 49581046e4
[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)
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: 46b33d45f7 am: a2002d1824 am: c53324ff49 am: d599ee0f6c am: 8c4e8c715d am: d23573db37
[automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824 am: c53324ff49 am: d599ee0f6c am: 8c4e8c715d
[automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824 am: c53324ff49 am: d599ee0f6c
[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 skipped: 49581046e4 skipped: 4986062ed3 skipped: 9b1b7bc603
[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
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours skipped: 2af33bcc3e skipped: e9ec3eb83b skipped: 49581046e4
[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)
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
Ray Essick
51fa4a4cc9
Merge changes from topic "asb-2018-04-o" into oreo-cts-dev
...
am: 6977a333a5
Change-Id: Ic84f6809d553296ebf00f43c1bd64706f3992e22
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
Change-Id: Icf7f366eaa4acfc637c34747af931d9486465595
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 -s ours
Change-Id: Ic32e80e3c05bed7890832c6d78eb559a22549006
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
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
1c90ff8dcf
Merge changes from topic "am-4267ce935a9849bdbcbcc7e45cbacd34" into oreo-cts-dev
...
* changes:
Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev am: 36b9badd7a
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours
2018-04-09 22:37:07 +00:00
Ray Essick
d5a0345907
Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev
...
am: 36b9badd7a
Change-Id: I05ed05ee99fa59d9de6a50b84746b98fca7eefff
2018-04-09 15:36:53 -07:00
Ray Essick
308f60a04c
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours
...
am: 81f274ebb2 -s ours
Change-Id: Ia8f2c0dc1dcaa42359b2c2211a6c8d6278647f45
2018-04-09 15:35:17 -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
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours
2018-04-09 22:28:05 +00: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
a1d6d60e04
Merge changes from topic "asb-2018-04-n1" into nougat-mr1-cts-dev
...
am: 34ef78f44f
Change-Id: I7077de030a59695ea3c1c8d99aa0b5aea3a8ef8a
2018-04-09 15:27:50 -07: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
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
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
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