Tina Zhou [Thu, 22 Dec 2016 02:51:48 +0000 (02:51 +0000)]
Merge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat-cts-dev am:
ce7ccaab4a am:
073e32f72f am:
3e3b90e9d6 am:
9959179887 am:
8ab0548300 am:
29fa182895
am:
bad040d8c9
Change-Id: I84032f9a6d9302ded72f3a89f3a3cf5c0f683331
Pyry Haulos [Thu, 22 Dec 2016 02:51:33 +0000 (02:51 +0000)]
Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048 am:
a42836566d am:
020b95377e am:
2da2988f32 am:
96f1cc8ba9 am:
d7e6b5159d am:
438f8c11ab
am:
9a18a2125d
Change-Id: Ic7e62802c6a46b3c12d74acab82644c6939e6304
Tina Zhou [Thu, 22 Dec 2016 02:50:59 +0000 (02:50 +0000)]
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am:
4812d6d47f am:
b44fae0a8a am:
4045968a8e am:
d1e1ca812f am:
6a64e395a5 am:
ffc44cfca7
am:
4fedaa18d0
Change-Id: I3c51fdf7be0bd5b9c0de6d54d65b6776661e5e9e
Pyry Haulos [Thu, 22 Dec 2016 02:50:51 +0000 (02:50 +0000)]
Update glslang to d02dc5d am:
b0ce1f083e am:
62137a913c am:
a03e8e8556 am:
092f056a9b am:
e4e623db59 am:
3ae98f7a99
am:
6ff9efe58c
Change-Id: I1bc6d0c8f1225725848e6f6efdc1553cf8f598e2
Pyry Haulos [Thu, 22 Dec 2016 02:50:43 +0000 (02:50 +0000)]
Cherry-pick SPIR-V ClipDistance validation fixes am:
ef29b7735d am:
9b853f5259 am:
ae704400e8 am:
91b53912e4 am:
a5b5961f77 am:
b18013c548 -s ours
am:
2509c96ece
Change-Id: Ia1c47780df6066a4b9d25c9d3d99463d4a1c6999
Pyry Haulos [Thu, 22 Dec 2016 02:50:35 +0000 (02:50 +0000)]
Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev am:
e71e3bbacd am:
5332103bc2 am:
f066c9a577 am:
df90278080 am:
3ff1767250 am:
1f280cdeb3
am:
6f5c2dace4
Change-Id: I8bacd1f4a8fb3fc418f6f05a699f28214f2036f0
Tina Zhou [Thu, 22 Dec 2016 02:46:49 +0000 (02:46 +0000)]
Merge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat-cts-dev am:
ce7ccaab4a am:
073e32f72f am:
3e3b90e9d6 am:
9959179887 am:
8ab0548300
am:
29fa182895
Change-Id: I0a461dbf16f57fb2b785bab9d5f6d7f2c3763e5b
Pyry Haulos [Thu, 22 Dec 2016 02:46:37 +0000 (02:46 +0000)]
Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048 am:
a42836566d am:
020b95377e am:
2da2988f32 am:
96f1cc8ba9 am:
d7e6b5159d
am:
438f8c11ab
Change-Id: If53fffd14068f606b3038d71dfe209b4d90f98f5
Tina Zhou [Thu, 22 Dec 2016 02:46:36 +0000 (02:46 +0000)]
Merge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat-cts-dev am:
ce7ccaab4a am:
073e32f72f am:
3e3b90e9d6 am:
9959179887 am:
8ab0548300 am:
bd83a918f8
am:
174a602315
Change-Id: I3133e1cfa8d48ba10767c709fd0778d39c013fe7
Pyry Haulos [Thu, 22 Dec 2016 02:46:23 +0000 (02:46 +0000)]
Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048 am:
a42836566d am:
020b95377e am:
2da2988f32 am:
96f1cc8ba9 am:
d7e6b5159d am:
e7edfc1088
am:
50c1f09126
Change-Id: I4207e49fe2986acde94d8668935d2bf804ea7893
Tina Zhou [Thu, 22 Dec 2016 02:46:07 +0000 (02:46 +0000)]
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am:
4812d6d47f am:
b44fae0a8a am:
4045968a8e am:
d1e1ca812f am:
6a64e395a5
am:
ffc44cfca7
Change-Id: I1a27a9a985eac26d8db649413ad396551f5323d1
Pyry Haulos [Thu, 22 Dec 2016 02:46:02 +0000 (02:46 +0000)]
Update glslang to d02dc5d am:
b0ce1f083e am:
62137a913c am:
a03e8e8556 am:
092f056a9b am:
e4e623db59
am:
3ae98f7a99
Change-Id: I681739b9409a86ae0c175dd3b0ac08c44b245bf5
Pyry Haulos [Thu, 22 Dec 2016 02:45:57 +0000 (02:45 +0000)]
Cherry-pick SPIR-V ClipDistance validation fixes am:
ef29b7735d am:
9b853f5259 am:
ae704400e8 am:
91b53912e4 am:
a5b5961f77
am:
b18013c548 -s ours
Change-Id: Id25377e8d5d8c84d538fea42ab98ef4d6d48a37e
Tina Zhou [Thu, 22 Dec 2016 02:45:53 +0000 (02:45 +0000)]
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am:
4812d6d47f am:
b44fae0a8a am:
4045968a8e am:
d1e1ca812f am:
6a64e395a5 am:
c54f821620
am:
39f956ac28
Change-Id: Ie21d50116ab96ac30408237503dd0829f634509d
Pyry Haulos [Thu, 22 Dec 2016 02:45:52 +0000 (02:45 +0000)]
Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev am:
e71e3bbacd am:
5332103bc2 am:
f066c9a577 am:
df90278080 am:
3ff1767250
am:
1f280cdeb3
Change-Id: I788a9cad20f12816e476e7c857a6c95a68ad352f
Pyry Haulos [Thu, 22 Dec 2016 02:45:48 +0000 (02:45 +0000)]
Update glslang to d02dc5d am:
b0ce1f083e am:
62137a913c am:
a03e8e8556 am:
092f056a9b am:
e4e623db59 -s ours am:
7ef5a2e2c8
am:
48e4480038
Change-Id: Id7ba8b9ef49ef311269e9e5f7f2961fec29c8006
Pyry Haulos [Thu, 22 Dec 2016 02:45:41 +0000 (02:45 +0000)]
Cherry-pick SPIR-V ClipDistance validation fixes am:
ef29b7735d am:
9b853f5259 am:
ae704400e8 am:
91b53912e4 am:
a5b5961f77 -s ours am:
519b83426e
am:
b44b1338b4
Change-Id: I257118a0d6de4802562d317661d2a765ce998be7
Pyry Haulos [Thu, 22 Dec 2016 02:45:35 +0000 (02:45 +0000)]
Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev am:
e71e3bbacd am:
5332103bc2 am:
f066c9a577 am:
df90278080 am:
3ff1767250 am:
ee947f1770
am:
7ba3b0654b
Change-Id: I84385a4ba62a88c20c15bc05df285ed8c3e26aba
Tina Zhou [Thu, 22 Dec 2016 02:40:50 +0000 (02:40 +0000)]
Merge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat-cts-dev am:
ce7ccaab4a am:
073e32f72f am:
3e3b90e9d6 am:
9959179887 am:
8ab0548300
am:
bd83a918f8
Change-Id: I51bfa6900d412618b438310f7b859cc8084417c5
Pyry Haulos [Thu, 22 Dec 2016 02:40:37 +0000 (02:40 +0000)]
Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048 am:
a42836566d am:
020b95377e am:
2da2988f32 am:
96f1cc8ba9 am:
d7e6b5159d
am:
e7edfc1088
Change-Id: I4d82f91a6939920c08c9eeebe9980af876f314dd
Tina Zhou [Thu, 22 Dec 2016 02:40:00 +0000 (02:40 +0000)]
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am:
4812d6d47f am:
b44fae0a8a am:
4045968a8e am:
d1e1ca812f am:
6a64e395a5
am:
c54f821620
Change-Id: I509c19856489116ab17e0b7848f9b2ffebc0e3ba
Pyry Haulos [Thu, 22 Dec 2016 02:39:52 +0000 (02:39 +0000)]
Update glslang to d02dc5d am:
b0ce1f083e am:
62137a913c am:
a03e8e8556 am:
092f056a9b am:
e4e623db59 -s ours
am:
7ef5a2e2c8
Change-Id: I1a4745fc9a3359bcba2cf649f1c34be8910b5a58
Pyry Haulos [Thu, 22 Dec 2016 02:39:45 +0000 (02:39 +0000)]
Cherry-pick SPIR-V ClipDistance validation fixes am:
ef29b7735d am:
9b853f5259 am:
ae704400e8 am:
91b53912e4 am:
a5b5961f77 -s ours
am:
519b83426e
Change-Id: I537b737fb57e404ccb0eb7cd66a9d21143cd04c3
Pyry Haulos [Thu, 22 Dec 2016 02:39:36 +0000 (02:39 +0000)]
Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev am:
e71e3bbacd am:
5332103bc2 am:
f066c9a577 am:
df90278080 am:
3ff1767250
am:
ee947f1770
Change-Id: I9347f52cbcd368a98c962819f6a525a0e43d350f
Tina Zhou [Thu, 22 Dec 2016 02:35:42 +0000 (02:35 +0000)]
Merge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat-cts-dev am:
ce7ccaab4a am:
073e32f72f am:
3e3b90e9d6 am:
9959179887
am:
8ab0548300
Change-Id: I0cb0050b068f24350817c9b9126e8a8c244611fd
Pyry Haulos [Thu, 22 Dec 2016 02:35:31 +0000 (02:35 +0000)]
Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048 am:
a42836566d am:
020b95377e am:
2da2988f32 am:
96f1cc8ba9
am:
d7e6b5159d
Change-Id: I52210ec72e94dab85d770fbeb4e1e671789adfff
Tina Zhou [Thu, 22 Dec 2016 02:34:59 +0000 (02:34 +0000)]
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am:
4812d6d47f am:
b44fae0a8a am:
4045968a8e am:
d1e1ca812f
am:
6a64e395a5
Change-Id: I5e54dda493336d0690a366efae0c0301df343bbf
Pyry Haulos [Thu, 22 Dec 2016 02:34:56 +0000 (02:34 +0000)]
Update glslang to d02dc5d am:
b0ce1f083e am:
62137a913c am:
a03e8e8556 am:
092f056a9b
am:
e4e623db59 -s ours
Change-Id: Ia6382ce1e3e682ae180aba07b2f9d6db48b179a2
Pyry Haulos [Thu, 22 Dec 2016 02:34:54 +0000 (02:34 +0000)]
Cherry-pick SPIR-V ClipDistance validation fixes am:
ef29b7735d am:
9b853f5259 am:
ae704400e8 am:
91b53912e4
am:
a5b5961f77 -s ours
Change-Id: I76c25dd4619d2bb20e789f94295a633b6225b15f
Pyry Haulos [Thu, 22 Dec 2016 02:34:51 +0000 (02:34 +0000)]
Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev am:
e71e3bbacd am:
5332103bc2 am:
f066c9a577 am:
df90278080
am:
3ff1767250
Change-Id: I08f61f97bdb22aad57911f2df11ff56c151c8616
Tina Zhou [Wed, 21 Dec 2016 23:35:36 +0000 (23:35 +0000)]
Merge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat-cts-dev am:
ce7ccaab4a am:
073e32f72f am:
3e3b90e9d6 am:
9959179887
am:
8ab0548300
Change-Id: I32386026628a54e94847bf95cb794aec20a87698
Pyry Haulos [Wed, 21 Dec 2016 23:35:24 +0000 (23:35 +0000)]
Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048 am:
a42836566d am:
020b95377e am:
2da2988f32 am:
96f1cc8ba9
am:
d7e6b5159d
Change-Id: I3229d8c3e80b465d15aeaecc2fb9c26b2a6b8992
Tina Zhou [Wed, 21 Dec 2016 23:34:53 +0000 (23:34 +0000)]
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am:
4812d6d47f am:
b44fae0a8a am:
4045968a8e am:
d1e1ca812f
am:
6a64e395a5
Change-Id: I0de981e47bba7261d547af21da577705a243380d
Pyry Haulos [Wed, 21 Dec 2016 23:34:50 +0000 (23:34 +0000)]
Update glslang to d02dc5d am:
b0ce1f083e am:
62137a913c am:
a03e8e8556 am:
092f056a9b
am:
e4e623db59
Change-Id: I20c5f71d79fce7e2a3fadec876b55ddf1aaae492
Pyry Haulos [Wed, 21 Dec 2016 23:34:47 +0000 (23:34 +0000)]
Cherry-pick SPIR-V ClipDistance validation fixes am:
ef29b7735d am:
9b853f5259 am:
ae704400e8 am:
91b53912e4
am:
a5b5961f77
Change-Id: If21c99e5d7e607f3ded68e4ec7167f699ae3d859
Pyry Haulos [Wed, 21 Dec 2016 23:34:43 +0000 (23:34 +0000)]
Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev am:
e71e3bbacd am:
5332103bc2 am:
f066c9a577 am:
df90278080
am:
3ff1767250
Change-Id: I3ae3e90a9577b739ff4814048082dc7e1ff54bee
Tina Zhou [Wed, 21 Dec 2016 23:26:10 +0000 (23:26 +0000)]
Merge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat-cts-dev am:
ce7ccaab4a am:
073e32f72f am:
3e3b90e9d6
am:
9959179887
Change-Id: I28b017ab925d82a3304451db13927678bab4ed87
Pyry Haulos [Wed, 21 Dec 2016 23:25:58 +0000 (23:25 +0000)]
Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048 am:
a42836566d am:
020b95377e am:
2da2988f32
am:
96f1cc8ba9
Change-Id: I76f659d4d91ab6b3562b0b278744e7736c7999a7
Tina Zhou [Wed, 21 Dec 2016 23:25:28 +0000 (23:25 +0000)]
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am:
4812d6d47f am:
b44fae0a8a am:
4045968a8e
am:
d1e1ca812f
Change-Id: I34f00e32575cbf482fd192b16368789a9fb80081
Pyry Haulos [Wed, 21 Dec 2016 23:25:26 +0000 (23:25 +0000)]
Update glslang to d02dc5d am:
b0ce1f083e am:
62137a913c am:
a03e8e8556
am:
092f056a9b
Change-Id: I27ab48a73a40c7e73e78f65be93dc1302d6133f3
Pyry Haulos [Wed, 21 Dec 2016 23:25:24 +0000 (23:25 +0000)]
Cherry-pick SPIR-V ClipDistance validation fixes am:
ef29b7735d am:
9b853f5259 am:
ae704400e8
am:
91b53912e4
Change-Id: Ic3d3a31adc8e261191ac9a2e892d31dcaf327e1d
Pyry Haulos [Wed, 21 Dec 2016 23:25:22 +0000 (23:25 +0000)]
Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev am:
e71e3bbacd am:
5332103bc2 am:
f066c9a577
am:
df90278080
Change-Id: I5571f9a6c8701129dd4236c95b5764b7747c3944
Tina Zhou [Wed, 21 Dec 2016 23:19:09 +0000 (23:19 +0000)]
Merge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat-cts-dev am:
ce7ccaab4a am:
073e32f72f
am:
3e3b90e9d6
Change-Id: I2fb74a59191d6aea30b0f57f41c4d9dcf5df10cc
Pyry Haulos [Wed, 21 Dec 2016 23:18:57 +0000 (23:18 +0000)]
Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048 am:
a42836566d am:
020b95377e
am:
2da2988f32
Change-Id: I20ca36cc3781aafa2f38cb5d45d8e19a473685ac
Tina Zhou [Wed, 21 Dec 2016 23:18:30 +0000 (23:18 +0000)]
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am:
4812d6d47f am:
b44fae0a8a
am:
4045968a8e
Change-Id: Iaf0bdea3563c785d7b70178784941298a817c535
Pyry Haulos [Wed, 21 Dec 2016 23:18:27 +0000 (23:18 +0000)]
Update glslang to d02dc5d am:
b0ce1f083e am:
62137a913c
am:
a03e8e8556
Change-Id: Ida321adb60b0c2a5452404c168636fa9393049ca
Pyry Haulos [Wed, 21 Dec 2016 23:18:23 +0000 (23:18 +0000)]
Cherry-pick SPIR-V ClipDistance validation fixes am:
ef29b7735d am:
9b853f5259
am:
ae704400e8
Change-Id: Ie37d0d42a21b19ad984570a7273590c349a20cf8
Pyry Haulos [Wed, 21 Dec 2016 23:18:19 +0000 (23:18 +0000)]
Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev am:
e71e3bbacd am:
5332103bc2
am:
f066c9a577
Change-Id: I0e567116a2cce1b652060aeddbe1c1f615674554
Tina Zhou [Wed, 21 Dec 2016 23:07:57 +0000 (23:07 +0000)]
Merge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat-cts-dev am:
ce7ccaab4a
am:
073e32f72f
Change-Id: I4c44e15d17669387f61033752398775ebc3e46d4
Pyry Haulos [Wed, 21 Dec 2016 23:07:45 +0000 (23:07 +0000)]
Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048 am:
a42836566d
am:
020b95377e
Change-Id: I7b6ff723d55faf9ba640248493b7c58a3534f365
Tina Zhou [Wed, 21 Dec 2016 23:07:17 +0000 (23:07 +0000)]
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am:
4812d6d47f
am:
b44fae0a8a
Change-Id: I4dd81db0bf1123030a372f72dacc1f09ec695272
Pyry Haulos [Wed, 21 Dec 2016 23:07:13 +0000 (23:07 +0000)]
Update glslang to d02dc5d am:
b0ce1f083e
am:
62137a913c
Change-Id: If38a684776482ff3cf156c22ef653ecf47173379
Pyry Haulos [Wed, 21 Dec 2016 23:07:09 +0000 (23:07 +0000)]
Cherry-pick SPIR-V ClipDistance validation fixes am:
ef29b7735d
am:
9b853f5259
Change-Id: Ib961d7855cf27b70d8f60169706536528e721090
Pyry Haulos [Wed, 21 Dec 2016 23:07:05 +0000 (23:07 +0000)]
Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev am:
e71e3bbacd
am:
5332103bc2
Change-Id: I2819b5fa50c9c2a939d74b2f0aff167e7279af6c
Tina Zhou [Wed, 21 Dec 2016 22:48:13 +0000 (22:48 +0000)]
Merge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat-cts-dev
am:
ce7ccaab4a
Change-Id: I2007ee1120f3a52381153a6432871dea4a2547fd
Pyry Haulos [Wed, 21 Dec 2016 22:48:12 +0000 (22:48 +0000)]
Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048
am:
a42836566d
Change-Id: Icf2b203e0ffe4a5f253c0c1b3f0b76deafd34c57
Tina Zhou [Wed, 21 Dec 2016 22:47:32 +0000 (22:47 +0000)]
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev
am:
4812d6d47f
Change-Id: I008b5f61e4e68e6783cffd2d2fe5cc11fc10e814
Pyry Haulos [Wed, 21 Dec 2016 22:47:31 +0000 (22:47 +0000)]
Update glslang to d02dc5d
am:
b0ce1f083e
Change-Id: Ib49ac26b3ce273532262cd99000b63b061c5347c
Pyry Haulos [Wed, 21 Dec 2016 22:47:28 +0000 (22:47 +0000)]
Cherry-pick SPIR-V ClipDistance validation fixes
am:
ef29b7735d
Change-Id: I1754888223cf4f23d359472276620400a0dc9a07
Pyry Haulos [Wed, 21 Dec 2016 22:47:25 +0000 (22:47 +0000)]
Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev
am:
e71e3bbacd
Change-Id: I466771aaf44fc8670cabf442bb35f1548b4b3342
Tina Zhou [Wed, 21 Dec 2016 22:31:04 +0000 (22:31 +0000)]
Merge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat-cts-dev
Tina Zhou [Wed, 21 Dec 2016 22:30:03 +0000 (22:30 +0000)]
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev
* changes:
Update glslang to d02dc5d
Cherry-pick SPIR-V ClipDistance validation fixes
Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev
Nicolas Boichat [Tue, 20 Dec 2016 22:35:30 +0000 (22:35 +0000)]
Merge "GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9 am:
639a3b82f5 am:
fddf33bdd1 am:
a6d2c746fa am:
4004893d31 am:
d6734426ee am:
ea87ae8483 am:
cc4458b117" into nyc-mr2-dev-plus-aosp
am:
bfdf5ec1fd
Change-Id: Ida8a1e34b9ce79b597db93d829e9fab721f7ba82
Nicolas Boichat [Tue, 20 Dec 2016 22:35:27 +0000 (22:35 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9 am:
639a3b82f5 am:
fddf33bdd1 am:
a6d2c746fa am:
4004893d31 am:
d6734426ee am:
ea87ae8483 am:
cc4458b117
am:
fd6006a7da
Change-Id: Ic1b08171ddbf6262ecb76894e7c9bc54a911475e
Nicolas Boichat [Tue, 20 Dec 2016 22:35:05 +0000 (22:35 +0000)]
Merge "GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9 am:
639a3b82f5 am:
fddf33bdd1 am:
a6d2c746fa am:
4004893d31 am:
d6734426ee am:
ea87ae8483 am:
323ee30ce8" into nyc-mr2-dev-plus-aosp
am:
843b458f27
Change-Id: I3a97f8be70e765a6f4a5d0a82e0451013cacdfbe
Nicolas Boichat [Tue, 20 Dec 2016 22:35:03 +0000 (22:35 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9 am:
639a3b82f5 am:
fddf33bdd1 am:
a6d2c746fa am:
4004893d31 am:
d6734426ee am:
ea87ae8483 am:
323ee30ce8
am:
daaf183bf3
Change-Id: Ic7f6f3b03c3bc32018b43737d7981cba887d3564
Nicolas Boichat [Tue, 20 Dec 2016 22:34:42 +0000 (22:34 +0000)]
Merge "resolve merge conflicts of cc5cabd to nyc-mr1-dev am:
7a338a6626 am:
b64869c70f am:
52bab3789f" into nyc-mr2-dev-plus-aosp
am:
a048f0632d
Change-Id: I8ec1b04a550e3f8329d29556aac89612ea03088e
Nicolas Boichat [Tue, 20 Dec 2016 22:34:40 +0000 (22:34 +0000)]
resolve merge conflicts of cc5cabd to nyc-mr1-dev am:
7a338a6626 am:
b64869c70f am:
52bab3789f
am:
108d39675d
Change-Id: Iee9f8deb6d1fee977e59d58a97d0b0f2b4e56129
Nicolas Boichat [Tue, 20 Dec 2016 22:34:24 +0000 (22:34 +0000)]
resolve merge conflicts of cc5cabd to nyc-mr1-dev am:
7a338a6626 am:
b64869c70f am:
1486f7ae07
am:
53e70a911c
Change-Id: Ie8639f12c0a664c24011c35d16259c0ca7ffe568
Android Build Merger (Role) [Tue, 20 Dec 2016 22:25:13 +0000 (22:25 +0000)]
Merge "GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9 am:
639a3b82f5 am:
fddf33bdd1 am:
a6d2c746fa am:
4004893d31 am:
d6734426ee am:
ea87ae8483 am:
cc4458b117" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Tue, 20 Dec 2016 22:25:13 +0000 (22:25 +0000)]
Merge "GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9 am:
639a3b82f5 am:
fddf33bdd1 am:
a6d2c746fa am:
4004893d31 am:
d6734426ee am:
ea87ae8483 am:
323ee30ce8" into nyc-mr2-dev-plus-aosp
Nicolas Boichat [Tue, 20 Dec 2016 22:25:07 +0000 (22:25 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9 am:
639a3b82f5 am:
fddf33bdd1 am:
a6d2c746fa am:
4004893d31 am:
d6734426ee am:
ea87ae8483
am:
cc4458b117
Change-Id: I06df05dafcd443b274d6765def8afdad3ab6109e
Nicolas Boichat [Tue, 20 Dec 2016 22:25:06 +0000 (22:25 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9 am:
639a3b82f5 am:
fddf33bdd1 am:
a6d2c746fa am:
4004893d31 am:
d6734426ee am:
ea87ae8483
am:
323ee30ce8
Change-Id: I5c8fd548ab5bc54b97047eefa983964902f8d074
Android Build Merger (Role) [Tue, 20 Dec 2016 22:25:02 +0000 (22:25 +0000)]
Merge "resolve merge conflicts of cc5cabd to nyc-mr1-dev am:
7a338a6626 am:
b64869c70f am:
52bab3789f" into nyc-mr2-dev-plus-aosp
Nicolas Boichat [Tue, 20 Dec 2016 22:24:55 +0000 (22:24 +0000)]
resolve merge conflicts of cc5cabd to nyc-mr1-dev am:
7a338a6626 am:
b64869c70f
am:
52bab3789f
Change-Id: Ie5115233fc6bef645f14f03e69039188dfd6d908
Nicolas Boichat [Tue, 20 Dec 2016 22:24:54 +0000 (22:24 +0000)]
resolve merge conflicts of cc5cabd to nyc-mr1-dev am:
7a338a6626 am:
b64869c70f
am:
1486f7ae07
Change-Id: I0a5d182b1c76e979346eb244c1b25bc3014e8208
Nicolas Boichat [Tue, 20 Dec 2016 22:20:35 +0000 (22:20 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9 am:
639a3b82f5 am:
fddf33bdd1 am:
a6d2c746fa am:
4004893d31 am:
d6734426ee
am:
ea87ae8483
Change-Id: I2e77efb8ba46959a0457184ced3e19cb79984403
Nicolas Boichat [Tue, 20 Dec 2016 22:20:34 +0000 (22:20 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
133c610be6 am:
cc0eaf79f0 am:
b6d32610cf am:
b3c1c2cf9b
am:
7385ca9aba
Change-Id: Iede6043f615559ed62fdf5c7b0bf2a0b61bd3cb5
Nicolas Boichat [Tue, 20 Dec 2016 22:20:33 +0000 (22:20 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9 am:
639a3b82f5 am:
fddf33bdd1 am:
a6d2c746fa am:
4004893d31 am:
d6734426ee
am:
ea87ae8483
Change-Id: I2275b7c4ea5516fcac695717559179ed1df7f6df
Nicolas Boichat [Tue, 20 Dec 2016 22:20:24 +0000 (22:20 +0000)]
resolve merge conflicts of cc5cabd to nyc-mr1-dev am:
7a338a6626
am:
b64869c70f
Change-Id: I1a875a589c43630fc3f1baf7fdff6902aacbca95
Nicolas Boichat [Tue, 20 Dec 2016 22:20:21 +0000 (22:20 +0000)]
resolve merge conflicts of cc5cabd to nyc-mr1-dev am:
7a338a6626
am:
b64869c70f
Change-Id: If0d874b08fb01e0c603f711675e6b2e1a52c3b87
Kalle Raita [Tue, 20 Dec 2016 22:20:20 +0000 (22:20 +0000)]
resolve merge conflicts of b6d3261 to nyc-mr1-dev-plus-aosp am:
ed852bf557
am:
900673646e
Change-Id: Ie357de73c562ce54ef3b8192c156822dc45f78c7
Nicolas Boichat [Tue, 20 Dec 2016 22:16:33 +0000 (22:16 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9 am:
639a3b82f5 am:
fddf33bdd1 am:
a6d2c746fa am:
4004893d31
am:
d6734426ee
Change-Id: Ia252fe1d37932ca3059e2b831e0131e836ab21c3
Nicolas Boichat [Tue, 20 Dec 2016 22:16:21 +0000 (22:16 +0000)]
resolve merge conflicts of cc5cabd to nyc-mr1-dev
am:
7a338a6626
Change-Id: I195a7d513828433103a20331bbe5eb1ee167a4f3
Nicolas Boichat [Tue, 20 Dec 2016 22:16:02 +0000 (22:16 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
133c610be6 am:
cc0eaf79f0 am:
b6d32610cf
am:
b3c1c2cf9b
Change-Id: Ibd863d1d528cf0f2ac8158e5f55646f65c0d2ccd
Kalle Raita [Tue, 20 Dec 2016 22:15:49 +0000 (22:15 +0000)]
resolve merge conflicts of b6d3261 to nyc-mr1-dev-plus-aosp
am:
ed852bf557
Change-Id: If6f52d32b3875bba642d0215831a634404872a73
Nicolas Boichat [Tue, 20 Dec 2016 22:11:55 +0000 (22:11 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
133c610be6 am:
cc0eaf79f0
am:
b6d32610cf
Change-Id: I9bf7977a59b947d4e9ef7e2a8a66f4d5a96fcbbd
Nicolas Boichat [Tue, 20 Dec 2016 22:11:54 +0000 (22:11 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9 am:
639a3b82f5 am:
fddf33bdd1 am:
a6d2c746fa
am:
4004893d31
Change-Id: Ie547c5910391a4e3f4fbb1700f20feab9a7f64e8
Kalle Raita [Tue, 20 Dec 2016 21:38:32 +0000 (13:38 -0800)]
resolve merge conflicts of b6d3261 to nyc-mr1-dev-plus-aosp
Test: Tried to run the install script locally
Change-Id: I2c34fa110c811741ad53bd42143bfd2a371b459a
Nicolas Boichat [Tue, 20 Dec 2016 19:56:55 +0000 (03:56 +0800)]
resolve merge conflicts of cc5cabd to nyc-mr1-dev
It appears
4ccc9fd56c9c0305c1cc325d2be8435cb68476e0
"Add the support to device connection via TCP/IP" was not automerged
to nyc-mr1-dev, for whatever reason, this merge also includes
that change.
Change-Id: Ifa9243f7ebc5d4ea7aa3030728a9cfe96789ab96
Nicolas Boichat [Tue, 20 Dec 2016 19:22:51 +0000 (19:22 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9 am:
639a3b82f5 am:
fddf33bdd1
am:
a6d2c746fa
Change-Id: I1023988b48ed6b133c9cd9a35e5bd16ce6101882
Nicolas Boichat [Tue, 20 Dec 2016 19:17:12 +0000 (19:17 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9 am:
639a3b82f5
am:
fddf33bdd1
Change-Id: I9b18b64c9e09af46abca64378f410c5819757001
Nicolas Boichat [Tue, 20 Dec 2016 19:12:40 +0000 (19:12 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9
am:
639a3b82f5
Change-Id: Ia47d588dc3bf3ade9552ab45c9eb1e13389b7216
Nicolas Boichat [Tue, 20 Dec 2016 19:09:12 +0000 (19:09 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
133c610be6
am:
cc0eaf79f0
Change-Id: I4bb85c1dce1fc225077a5c46911d39dd395c3e40
Nicolas Boichat [Tue, 20 Dec 2016 19:09:09 +0000 (19:09 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf
am:
79041623c9
Change-Id: I571901bbc48bffdad90e2a5f278d75a2fe1833ba
Nicolas Boichat [Tue, 20 Dec 2016 19:09:00 +0000 (19:09 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
133c610be6
am:
4c63135524
Change-Id: I9d337977ac0e01e8c8fd0b079a3f25c9e2cdcaaa
Nicolas Boichat [Tue, 20 Dec 2016 19:04:09 +0000 (19:04 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509
am:
a44c013aaf
Change-Id: Ic6181b284d350dedca354ddd60706903f639ba4a
Nicolas Boichat [Tue, 20 Dec 2016 18:59:57 +0000 (18:59 +0000)]
GetDevices: Also allow `\.` to be part of the host name
am:
dbf9715509
Change-Id: Id812eaa1a85dded4241ae6d760de072532228109
Nicolas Boichat [Tue, 20 Dec 2016 18:59:40 +0000 (18:59 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509
am:
133c610be6
Change-Id: I21054992a16e3e6847a8af086528f4172602d614
Nicolas Boichat [Tue, 20 Dec 2016 18:59:39 +0000 (18:59 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509
am:
133c610be6
Change-Id: I8938bf6b769de3d2da911243f203181f191ec89f