Ray Essick
0fae69ebd7
Merge changes from topic "am-4267ce935a9849bdbcbcc7e45cbacd34" into oreo-cts-dev am: 1c90ff8dcf am: 5b5f73c2e8
...
am: 37ca5b50e8
Change-Id: Iae252f3f444f11641ef92a39494c85f57566de2c
2018-04-09 17:55:16 -07:00
Ray Essick
6ae132c625
[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: c1a7ce019c
...
am: 7a3920dfa4
Change-Id: I284890418cc5fe265d261b4c2852ebb083a7d34c
2018-04-09 17:36:36 -07:00
Android Build Merger (Role)
6e146b4699
Merge "Merge changes from topic "am-1040f2fedf9f49a9a38f5d0878c0a1d0" into oreo-mr1-cts-dev am: 16af42313d" into oc-mr1-dev
2018-04-10 00:34:26 +00:00
Android Build Merger (Role)
9d36da58e7
Merge "[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours am: 72b96b0354 -s ours am: b591008bc2 -s ours" into oc-mr1-dev
2018-04-10 00:34:22 +00:00
Ray Essick
77f5a846d9
Merge changes from topic "am-1040f2fedf9f49a9a38f5d0878c0a1d0" into oreo-mr1-cts-dev
...
am: 16af42313d
Change-Id: Ia6fafc0f95b4160da31f6015b59fc0ab79e766c6
2018-04-09 17:34:08 -07:00
Ray Essick
91014e8da2
Merge changes from topic "am-0ac6ccf47239465e9891c4d8b9d8f076" into oc-dev am: 7fc94d02ca
...
am: 52d573a044
Change-Id: I3b68aaa872313c0a9cf0506c7601648b85e32276
2018-04-09 17:33:53 -07:00
Ray Essick
37ca5b50e8
Merge changes from topic "am-4267ce935a9849bdbcbcc7e45cbacd34" into oreo-cts-dev am: 1c90ff8dcf
...
am: 5b5f73c2e8
Change-Id: Ic00da51c5525f934d640a100b3a8d1830e1c2db8
2018-04-09 17:33:40 -07:00
Ray Essick
644ce499bd
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours am: 72b96b0354 -s ours
...
am: b591008bc2 -s ours
Change-Id: I78097d3fa74d50a0328a953230138e66beec29fc
2018-04-09 17:33:12 -07:00
Ray Essick
7a3920dfa4
[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: c1a7ce019c
Change-Id: If52d64e09d7b1570ed1f8b7e90e47b4e24f05956
2018-04-09 17:16:08 -07:00
Ray Essick
03a6e259da
Merge changes from topic "asb-2018-04-o" into oreo-cts-dev am: 6977a333a5 am: 51fa4a4cc9
...
am: ee4732c77c
Change-Id: I2e1fcbab25ee2cc680250881308e8d4b9d01d96f
2018-04-09 17:13:24 -07:00
Ray Essick
52d573a044
Merge changes from topic "am-0ac6ccf47239465e9891c4d8b9d8f076" into oc-dev
...
am: 7fc94d02ca
Change-Id: Ic222e3a15f1aa60792a7befa6423e97d12c23fac
2018-04-09 17:13:22 -07:00
Ray Essick
c8781cfae4
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ae91a6ad6f -s ours am: 81c482bdd4
...
am: a208a33079
Change-Id: I23ce9a632344d83d34373f72082a9cfed99568bc
2018-04-09 17:10:51 -07:00
Ray Essick
ee4732c77c
Merge changes from topic "asb-2018-04-o" into oreo-cts-dev am: 6977a333a5
...
am: 51fa4a4cc9
Change-Id: Id37c3ae5f707f8677ea5ece9d7a432604eb7dcb4
2018-04-09 17:06:44 -07:00
Android Merger
16af42313d
Merge changes from topic "am-1040f2fedf9f49a9a38f5d0878c0a1d0" into oreo-mr1-cts-dev
...
* changes:
Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev am: dbfdb95147
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours am: 72b96b0354 -s ours
2018-04-10 00:04:01 +00:00
Ray Essick
3cca65faac
Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev
...
am: dbfdb95147
Change-Id: I2aea8818706cfa197efaccd62152c57d078de93c
2018-04-09 17:03:48 -07:00
Ray Essick
a208a33079
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ae91a6ad6f -s ours
...
am: 81c482bdd4
Change-Id: I7972a70982b229d91cd168b07fb4ae6102dd5cf9
2018-04-09 17:03:44 -07:00
Ray Essick
0dc9743ac1
Merge "Merge changes from topic "am-a984919964a248a18190aca22d4db916" into oreo-cts-dev am: 0eeb6c53d1" into oc-dev am: f2aeff9120
...
am: e9a9daa81a
Change-Id: I9cd9af6893c182b58935d991aa6669b5f244de7d
2018-04-09 17:00:28 -07:00
Ray Essick
b591008bc2
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours
...
am: 72b96b0354 -s ours
Change-Id: I53fee208998ce3d62bd58e5280c3cbbe147d8c45
2018-04-09 16:59:06 -07:00
Ray Essick
9e863b8450
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 am: 50988d78ff
...
am: b4dde24b91
Change-Id: I244846e8cf2b86b295d6fd81de56f3a01c705378
2018-04-09 16:56:41 -07:00
Android Merger
dbfdb95147
Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev
...
* changes:
Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94da
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours
2018-04-09 23:51:21 +00:00
Ray Essick
793b437465
Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev
...
am: 8ef12d94da
Change-Id: I296d1bd01c211fb769e6a7da3d10bf8c91ffcb2d
2018-04-09 16:51:06 -07:00
Ray Essick
72b96b0354
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours
...
am: bafd18446f -s ours
Change-Id: I32d61ceb0610ed88bfeb574624e6df0a655bd458
2018-04-09 16:48:16 -07:00
Ray Essick
e9a9daa81a
Merge "Merge changes from topic "am-a984919964a248a18190aca22d4db916" into oreo-cts-dev am: 0eeb6c53d1" into oc-dev
...
am: f2aeff9120
Change-Id: I613122f6d0c51920809a22bd7adf47cfdfa48420
2018-04-09 16:48:06 -07:00
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
Android Merger
8ef12d94da
Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev
...
* changes:
Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours
2018-04-09 23:43:56 +00:00
Ray Essick
dfc472585a
Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev
...
am: 1fd90c968d
Change-Id: I19327405fc5eb081741a140637b531b265683ce7
2018-04-09 16:43:45 -07:00
Ray Essick
b4dde24b91
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
...
am: 50988d78ff
Change-Id: Ie2fff0074dc2f486d434e3a433653d9bb7068e75
2018-04-09 16:43:17 -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
bafd18446f
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours
...
am: afb3e84599 -s ours
Change-Id: Iefbef63bc6c5cd09ce6b949f31e8a3fd8c822a15
2018-04-09 16:41:51 -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
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours
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
Change-Id: I1db217fe93ba600f5a732aa8418705f2133af020
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
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
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
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
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
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
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