Android Build Merger (Role)
01a2073429
Merge "Merge changes from topic "am-96d8ccc4e1e44c30aec62bb030c6529c" into oreo-mr1-cts-dev am: f0c2985ba8" into oc-mr1-dev
2018-04-09 23:47:45 +00:00
Android Build Merger (Role)
f893a5ace2
Merge "[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 am: 3ace7af527 -s ours" into oc-mr1-dev
2018-04-09 23:47:41 +00:00
Ray Essick
1a8b3d6ffc
Merge changes from topic "am-96d8ccc4e1e44c30aec62bb030c6529c" into oreo-mr1-cts-dev
...
am: f0c2985ba8
Change-Id: I6cf85069a417a37db32e2bbab1720de6776afe25
2018-04-09 16:47:26 -07:00
Ray Essick
97b4b1781e
[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
...
am: 3ace7af527 -s ours
Change-Id: I6535fac037e64685d3497646aa38bd8370403a72
2018-04-09 16:45:49 -07:00
Ray Essick
e2fd86301a
[automerger] Merge changes from topic "asb-2018-04-n1" into nougat-mr1-cts-dev am: 34ef78f44f am: f727768aa7 am: b5c3ab95a8 am: efcf101cf2 am: 23be4acd42
...
am: 1507393897
Change-Id: I6e94c7014e2ae8fe3d99520e9cb95b918e9bf586
2018-04-09 16:44:57 -07:00
Ray Essick
749e2c39a0
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours skipped: d4d28bcb12 skipped: 948813147b skipped: 1cd8984784 am: 0c883452f2
...
am: aa7ce42421
Change-Id: I649d54fb86aae841b9b0e5dafb6493e6823c1561
2018-04-09 16:42:33 -07:00
Ray Essick
1507393897
[automerger] Merge changes from topic "asb-2018-04-n1" into nougat-mr1-cts-dev am: 34ef78f44f am: f727768aa7 am: b5c3ab95a8 am: efcf101cf2
...
am: 23be4acd42
Change-Id: I52e0d6d57386c941d838db5d105e15d38a899b74
2018-04-09 16:30:31 -07:00
Ray Essick
aa7ce42421
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours skipped: d4d28bcb12 skipped: 948813147b skipped: 1cd8984784
...
am: 0c883452f2
Change-Id: Iccc3be55c8dd75daf8c5184acfd67d5e6430d720
2018-04-09 16:29:08 -07:00
Ray Essick
ba7829adb5
Merge changes from topic "am-255f7edfcc6f4ec1a5498250fdcf0dc9" into oreo-mr1-cts-dev
...
am: f095afee74
Change-Id: I0d3c8f6eb580656405543377dc073ae116661bc7
2018-04-09 16:25:32 -07:00
Ray Essick
75d237b3ac
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ae91a6ad6f -s ours
...
am: 26d4c1f151 -s ours
Change-Id: I9a1a7075f9df156541ff083469e9cd679dde2e6f
2018-04-09 16:24:55 -07:00
Ray Essick
4f668aaf31
Merge changes from topic "am-577c7e51c7294d17a1c29c24e9664b0a" into oreo-mr1-cts-dev
...
am: 666f941b5a
Change-Id: I93160ff6bf44b8d186f86e0c54ea463df48dbfc5
2018-04-09 16:19:21 -07:00
Ray Essick
14b3dd4079
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours am: 8dd2d10a1b -s ours
...
am: f3d4af802c -s ours
Change-Id: Ie1ce0237b3eed4b170a4cf87e0387ce7aaac4673
2018-04-09 16:18:39 -07:00
Ray Essick
b5c3d08260
Merge changes from topic "asb-2018-04-o1" into oreo-mr1-cts-dev
...
am: f5e53a396f
Change-Id: I03ecdfbb20e5b882332e7a018fed9b6969990974
2018-04-09 16:13:03 -07:00
Ray Essick
2a60c1ea48
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454
...
am: ac5b691121 -s ours
Change-Id: I68bd2d8587558b601681d0a46b22c6f30cb9fa62
2018-04-09 16:12:37 -07:00
Android Merger
f0c2985ba8
Merge changes from topic "am-96d8ccc4e1e44c30aec62bb030c6529c" into oreo-mr1-cts-dev
...
* changes:
Merge changes from topic "am-4267ce935a9849bdbcbcc7e45cbacd34" into oreo-cts-dev am: 1c90ff8dcf
[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
2018-04-09 22:53:51 +00:00
Ray Essick
d9a966f2f9
Merge changes from topic "am-4267ce935a9849bdbcbcc7e45cbacd34" into oreo-cts-dev
...
am: 1c90ff8dcf
Change-Id: Ia6a800ccdc908776040c2d9b2a793fbdb2e174fc
2018-04-09 15:53:38 -07:00
Ray Essick
3ace7af527
[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: I2c54e0109d53efdeff69279f0c796d5bf103a58e
2018-04-09 15:48:01 -07: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
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)
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
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
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
Android Merger
f095afee74
Merge changes from topic "am-255f7edfcc6f4ec1a5498250fdcf0dc9" into oreo-mr1-cts-dev
...
* changes:
Merge changes from topic "asb-2018-04-o" into oreo-cts-dev am: 6977a333a5
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ae91a6ad6f -s ours
2018-04-09 22:39:44 +00:00
Ray Essick
12cc7ae103
Merge changes from topic "asb-2018-04-o" into oreo-cts-dev
...
am: 6977a333a5
Change-Id: I7c4d9e4ee3339a65bd7da67674d932813b588725
2018-04-09 15:39:30 -07:00
Ray Essick
26d4c1f151
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454
...
am: ae91a6ad6f -s ours
Change-Id: I07f5461359c0b0d810d90c8a208c2c9fa00e1413
2018-04-09 15:38:51 -07:00
Android Merger
666f941b5a
Merge changes from topic "am-577c7e51c7294d17a1c29c24e9664b0a" into oreo-mr1-cts-dev
...
* changes:
Merge changes from topic "am-a984919964a248a18190aca22d4db916" into oreo-cts-dev am: 0eeb6c53d1
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours am: 8dd2d10a1b -s ours
2018-04-09 22:38:18 +00:00
Treehugger Robot
f5e53a396f
Merge changes from topic "asb-2018-04-o1" into oreo-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
DO NOT MERGE Camera: Add test for OutputConfiguration parcelling
2018-04-09 22:37:33 +00:00
Ray Essick
a0de7cb873
Merge changes from topic "am-a984919964a248a18190aca22d4db916" into oreo-cts-dev
...
am: 0eeb6c53d1
Change-Id: I999d875a15b9a037165e4782f285a591334b4daf
2018-04-09 15:37:30 -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
f3d4af802c
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours
...
am: 8dd2d10a1b -s ours
Change-Id: I3b2cc560a4b664399a742d4301304dcf3e99f6ed
2018-04-09 15:35:30 -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
31786e4612
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:50:16 -07: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
Adam Vartanian
bbc39aba5b
Merge changes from topic "am-325cd506-a538-4cb7-a65c-bc30576c59e9" into oc-dev am: fb27c032ff
...
am: 3c22d6bea8
Change-Id: I2fe9d75f0bf5b94f2fa0b2d0a819f2b8281ccf7b
2018-02-02 03:32:08 +00:00
Adam Vartanian
3c22d6bea8
Merge changes from topic "am-325cd506-a538-4cb7-a65c-bc30576c59e9" into oc-dev
...
am: fb27c032ff
Change-Id: I459897b291fff063091f4d5e64330df4ade47c0c
2018-02-01 23:31:51 +00: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