Commit Graph

1200 Commits

Author SHA1 Message Date
bohu
3fa68cbbc6 Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 4b6d85e98c am: 6dd1ce66c9 am: 546530a93b am: 1919b19cbe" into nyc-mr1-dev-plus-aosp am: c3db5d5c66
am: e5197c114d

Change-Id: Idaba698307e59205e2252996755d996706438021
2017-02-03 18:00:50 +00:00
bohu
b852a1aa40 Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 4b6d85e98c am: 6dd1ce66c9 am: 546530a93b am: 1919b19cbe am: 1291cc7fa9" into nyc-mr2-dev-plus-aosp
am: 6a33b69f00

Change-Id: I8319686847f9905ea9a27cf7a1423f038908b751
2017-02-03 18:00:02 +00:00
bohu
e72da692ca CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 4b6d85e98c am: 6dd1ce66c9 am: 546530a93b am: 1919b19cbe am: 1291cc7fa9
am: 5a8fa3366d

Change-Id: I376ecb552dce65741c22787b8e5599a8f0124a79
2017-02-03 17:59:58 +00:00
bohu
5ea0afb6e8 Merge "Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb" am: 1b9c5a00a4 am: 65617d384d am: b84c9d675a" into nyc-mr2-dev-plus-aosp
am: ce8f12cab7

Change-Id: I8356883af4111c360d89496cf4ad3a01f6b49b76
2017-02-03 17:57:06 +00:00
bohu
7361be3388 Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb" am: 1b9c5a00a4 am: 65617d384d am: b84c9d675a
am: 973b1fe2fc

Change-Id: Iae33a95a52536d21cb330d3ca176409b5d7d3058
2017-02-03 17:57:02 +00:00
bohu
9a53219d59 Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" into nyc-mr1-dev am: 5913ea0554 am: 5dd794162b am: ee65b88295
am: 869f74f726

Change-Id: Id6a5dead9fb19adec8e6de6798f97ae730631a09
2017-02-03 17:56:21 +00:00
bohu
53d54c7c77 CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4 am: d8667fc889 am: a8d9471bb9 am: 100c1a535e
am: 397ef33200

Change-Id: I11973499e2521c303527b203fb6e5cc925eef729
2017-02-03 17:55:41 +00:00
bohu
0a67309fd4 CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 4b6d85e98c am: 6dd1ce66c9 am: 546530a93b am: 1919b19cbe am: d463437f47
am: 5c86e490f5

Change-Id: I59a5ba6dd17f8cc7a7840870e6dc8a39e256cebb
2017-02-03 17:55:09 +00:00
Android Build Merger (Role)
6a33b69f00 Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 4b6d85e98c am: 6dd1ce66c9 am: 546530a93b am: 1919b19cbe am: 1291cc7fa9" into nyc-mr2-dev-plus-aosp 2017-02-03 17:52:39 +00:00
bohu
e5197c114d Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 4b6d85e98c am: 6dd1ce66c9 am: 546530a93b am: 1919b19cbe" into nyc-mr1-dev-plus-aosp
am: c3db5d5c66

Change-Id: Ia185f02bd384d77f4ad17fba7d8bd40027b5b3a7
2017-02-03 17:52:16 +00:00
bohu
5a8fa3366d CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 4b6d85e98c am: 6dd1ce66c9 am: 546530a93b am: 1919b19cbe
am: 1291cc7fa9

Change-Id: I75a0692944ca3054c39df039bb529b5a39a6b199
2017-02-03 17:52:13 +00:00
bohu
ab7e16fead Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb am: cf06f6bca3 am: 96187b032a am: 2322e1ffb7
am: 62c870285a

Change-Id: If85ae7a4c0d4720f46eb9057c7d5b0cda6bf41b2
2017-02-03 17:51:48 +00:00
Android Build Merger (Role)
ce8f12cab7 Merge "Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb" am: 1b9c5a00a4 am: 65617d384d am: b84c9d675a" into nyc-mr2-dev-plus-aosp 2017-02-03 17:51:23 +00:00
bohu
bd3520c0ef Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" am: f9329b58df am: 1ec884189f am: d443dc8479
am: 056d20bbd4

Change-Id: I57419e01277c22bb7e441db798a4543ee3a93c25
2017-02-03 17:51:12 +00:00
bohu
973b1fe2fc Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb" am: 1b9c5a00a4 am: 65617d384d
am: b84c9d675a

Change-Id: Ia254cd5471ca796f14f47bef1cfe068423b8bd87
2017-02-03 17:51:01 +00:00
bohu
869f74f726 Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" into nyc-mr1-dev am: 5913ea0554 am: 5dd794162b
am: ee65b88295

Change-Id: I828c8dcc087a1af805bef5f0b4acacaf7db676c6
2017-02-03 17:50:35 +00:00
bohu
397ef33200 CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4 am: d8667fc889 am: a8d9471bb9
am: 100c1a535e

Change-Id: I616840b16ee787da38ac0c1ad47cc8ec61e6c216
2017-02-03 17:50:03 +00:00
bohu
5c86e490f5 CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 4b6d85e98c am: 6dd1ce66c9 am: 546530a93b am: 1919b19cbe
am: d463437f47

Change-Id: Id2d4f174fc857d6a002653a66a8726f3f45670f9
2017-02-03 17:49:29 +00:00
bohu
62c870285a Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb am: cf06f6bca3 am: 96187b032a
am: 2322e1ffb7

Change-Id: Ib14391e17416a1497f8c8c5c38483c95d5a39bb2
2017-02-03 17:47:39 +00:00
bohu
056d20bbd4 Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" am: f9329b58df am: 1ec884189f
am: d443dc8479

Change-Id: Iff152dacc120cb694219ca09aa768f9147ec6ad8
2017-02-03 17:47:05 +00:00
Android Build Merger (Role)
c3db5d5c66 Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 4b6d85e98c am: 6dd1ce66c9 am: 546530a93b am: 1919b19cbe" into nyc-mr1-dev-plus-aosp 2017-02-03 17:45:18 +00:00
bohu
1291cc7fa9 CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 4b6d85e98c am: 6dd1ce66c9 am: 546530a93b
am: 1919b19cbe

Change-Id: I4acc3656b4593cea19e4c1fe6acb62bacff6e864
2017-02-03 17:44:57 +00:00
bohu
b84c9d675a Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb" am: 1b9c5a00a4
am: 65617d384d

Change-Id: Ib2e573bb3dd060dd6a0fd0d95cd978b7bee54374
2017-02-03 17:44:21 +00:00
bohu
2322e1ffb7 Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb am: cf06f6bca3
am: 96187b032a

Change-Id: I81afae1bb2ce8995346a45ab24a483171d1ffa56
2017-02-03 17:43:47 +00:00
bohu
d443dc8479 Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" am: f9329b58df
am: 1ec884189f

Change-Id: Ic3777c5ad0088d466d7cd35d6d2e7a28bb501917
2017-02-03 17:43:14 +00:00
bohu
5dd794162b Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" into nyc-mr1-dev
am: 5913ea0554

Change-Id: I22d32e495dd9b2f0567b52713b0071eb95e8ed75
2017-02-03 17:40:53 +00:00
bohu
a8d9471bb9 CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4
am: d8667fc889

Change-Id: I9e72c7dfbf3bdbb3a000e7a9594b41957aee32b6
2017-02-03 17:40:49 +00:00
bohu
1919b19cbe CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 4b6d85e98c am: 6dd1ce66c9
am: 546530a93b

Change-Id: I4b7001dd916322ca68faec4264692034227f085b
2017-02-03 17:40:11 +00:00
bohu
65617d384d Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb"
am: 1b9c5a00a4

Change-Id: I44a5c060361c23d6675411b9b4a8b6bf05d21576
2017-02-03 17:38:27 +00:00
bohu
96187b032a Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb
am: cf06f6bca3

Change-Id: I5ee0b22f18830503fed5951ea661280fe09cb07f
2017-02-03 17:38:25 +00:00
bohu
1ec884189f Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4"
am: f9329b58df

Change-Id: Id036a652078559982dbe05c40e8400b1a500464b
2017-02-03 17:37:45 +00:00
Android Build Merger (Role)
5913ea0554 Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" into nyc-mr1-dev 2017-02-03 17:36:27 +00:00
bohu
d8667fc889 CTS: skip wifi related net test if no such feature am: 2fa6e7ce43
am: 40f71feca4

Change-Id: I6b99378ecda88b7ab267f1848ea945e0384f96f2
2017-02-03 17:35:58 +00:00
bohu
546530a93b CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 4b6d85e98c
am: 6dd1ce66c9

Change-Id: I9fb10ed3c2e3040279b36850f3b5b2808dcf0f24
2017-02-03 17:35:43 +00:00
Android Merger
1b9c5a00a4 Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb" 2017-02-03 17:32:08 +00:00
Android Merger
f9329b58df Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" 2017-02-03 17:32:02 +00:00
bohu
cf06f6bca3 Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev
am: 266d07f3cb

Change-Id: I681b7ecf8f0990553a0cff59891771c8fa638bd1
2017-02-03 17:31:54 +00:00
bohu
5e6a02e4a3 CTS: skip wifi related net test if no such feature am: 2fa6e7ce43
am: 40f71feca4

Change-Id: I4bbff2b7826bc627618c425243493c09feab3c96
2017-02-03 17:31:52 +00:00
bohu
6dd1ce66c9 CTS: skip wifi related net test if no such feature am: 2fa6e7ce43
am: 4b6d85e98c

Change-Id: Iecc534b475bc1c0c4211aba8b87122476b89e263
2017-02-03 17:31:11 +00:00
Android Merger
266d07f3cb Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev 2017-02-03 17:29:18 +00:00
bohu
4b6d85e98c CTS: skip wifi related net test if no such feature
am: 2fa6e7ce43

Change-Id: I9a672139ea9e1b8675912a06315c6a4902411be8
2017-02-03 17:29:11 +00:00
bohu
40f71feca4 CTS: skip wifi related net test if no such feature
am: 2fa6e7ce43

Change-Id: If1a8a0143687113dcde6173dcad05ed14597f5a8
2017-02-03 17:29:09 +00:00
Chris Manton
2fe8ce3f17 Include Wear device idle settings am: 1ac3a1f3fc am: 3af55efe11 am: 9096c0a7db am: c83638d68c
am: 0af233b4b9

Change-Id: If454b6cb6f105bb81b26099662d4980509d18355
2017-02-03 01:26:00 +00:00
Chris Manton
903fcd838d Include Wear device idle settings am: 1ac3a1f3fc am: 3af55efe11 am: 9096c0a7db am: 7414c4e875
am: e6a64ea0c6

Change-Id: Icd34dfde13ac4e42e2d64ab5c20acf4e1088f566
2017-02-03 01:12:46 +00:00
Chris Manton
da59f89ae4 Merge "Include Wear device idle settings am: 1ac3a1f3fc" am: afae7a6e23 am: f60a65f816 am: f8cd2e64be
am: e68295db9e

Change-Id: I1050da791fb350b3e4d5ab743c7542739e4846e3
2017-02-03 01:02:13 +00:00
Chris Manton
0af233b4b9 Include Wear device idle settings am: 1ac3a1f3fc am: 3af55efe11 am: 9096c0a7db
am: c83638d68c

Change-Id: I0485509299dcfa381dc595eed2fec41b4e73571c
2017-02-03 00:43:05 +00:00
Chris Manton
e6a64ea0c6 Include Wear device idle settings am: 1ac3a1f3fc am: 3af55efe11 am: 9096c0a7db
am: 7414c4e875

Change-Id: I2964050d7a28657ee796a98e23cf3b2083e97043
2017-02-03 00:36:33 +00:00
Chris Manton
c83638d68c Include Wear device idle settings am: 1ac3a1f3fc am: 3af55efe11
am: 9096c0a7db

Change-Id: I9b50fea1aed8c6c5a806ad70eaf2229fe3f44275
2017-02-03 00:30:15 +00:00
Chris Manton
e68295db9e Merge "Include Wear device idle settings am: 1ac3a1f3fc" am: afae7a6e23 am: f60a65f816
am: f8cd2e64be

Change-Id: Ide4d5573fd5d70b8b8875f22a84d6ee155a0e7ea
2017-02-03 00:25:54 +00:00
Chris Manton
9096c0a7db Include Wear device idle settings am: 1ac3a1f3fc
am: 3af55efe11

Change-Id: Ieefea1af69affa64b9e665c92c5310d54c3d9b05
2017-02-03 00:20:04 +00:00