Commit Graph

1252 Commits

Author SHA1 Message Date
bohu
892ca03290 Merge "Merge "Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb" into nyc-mr1-dev am: 62ad215942 am: 12bd64c6fe" into nyc-mr1-dev-plus-aosp am: 8cb528be24" into nyc-mr2-dev-plus-aosp
am: d3f34832ff

Change-Id: Ia3d8e7d45735c1a86f086b062f32ceedd566b2b8
2017-02-03 18:27:49 +00:00
bohu
4374f1b7f7 Merge "Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb" into nyc-mr1-dev am: 62ad215942 am: 12bd64c6fe" into nyc-mr1-dev-plus-aosp am: 8cb528be24
am: d12df4a355

Change-Id: I3b04dbc90b1f03b93540a9d5fc85d6f3a938d369
2017-02-03 18:27:45 +00:00
bohu
4f0029f5df Merge "Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb" into nyc-mr1-dev am: 62ad215942 am: 12bd64c6fe am: 438edd0637" into nyc-mr2-dev-plus-aosp
am: b652f8e29c

Change-Id: I68cdb88e5781b989b4aa4bb640aeef9e48895356
2017-02-03 18:26:48 +00:00
bohu
83364214d1 Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb" into nyc-mr1-dev am: 62ad215942 am: 12bd64c6fe am: 438edd0637
am: 01aa7f9669

Change-Id: Iebe2369be2d747e6ef95be6c888db4ec0fdb9e75
2017-02-03 18:26:43 +00:00
bohu
31b0bf0ca2 Merge "Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb am: b2435d99d4 am: 462d211655" into nyc-mr1-dev-plus-aosp am: 1921ef39f7" into nyc-mr2-dev-plus-aosp
am: 57399eed91

Change-Id: I25df6cd3203893e1883b3dc9c4fa9c416ea05623
2017-02-03 18:25:42 +00:00
bohu
7a8822eff5 Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb am: b2435d99d4 am: 462d211655" into nyc-mr1-dev-plus-aosp am: 1921ef39f7
am: 5abe1fc6b2

Change-Id: I259f5fa6732197169469e5f922de15b0bd4ea156
2017-02-03 18:25:38 +00:00
bohu
cbe6bc789c Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb am: b2435d99d4 am: 462d211655 am: 4771c1e74a" into nyc-mr2-dev-plus-aosp
am: 669273873e

Change-Id: Ie26e23cc70cb719e2e54f430d0979cbc3a04dd47
2017-02-03 18:24:44 +00:00
bohu
b9bfa6b6cb Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb am: b2435d99d4 am: 462d211655 am: 4771c1e74a
am: b002d878e1

Change-Id: I26ab9b888e3a5776a9aba3c689a8e1ca647cbd02
2017-02-03 18:24:40 +00:00
bohu
fb5ac46c89 Merge "Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" into nyc-mr1-dev am: 5913ea0554 am: 5dd794162b" into nyc-mr1-dev-plus-aosp am: d1b373f42e" into nyc-mr2-dev-plus-aosp
am: 8d5c4e3319

Change-Id: I1c511df10e5a71e30ff03fac7dfb57b9c06b3281
2017-02-03 18:16:56 +00:00
bohu
d32a481a67 Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" into nyc-mr1-dev am: 5913ea0554 am: 5dd794162b" into nyc-mr1-dev-plus-aosp am: d1b373f42e
am: 8bb6b8d5f7

Change-Id: I600be9a6703906cc18a95609f6d9317ed20e165f
2017-02-03 18:16:53 +00:00
bohu
5e473a594e Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" into nyc-mr1-dev am: 5913ea0554 am: 5dd794162b am: a48efa4889" into nyc-mr2-dev-plus-aosp
am: caafc3465e

Change-Id: Ia72c0754c7a12267ea93175046b987fde98adf32
2017-02-03 18:14:55 +00:00
bohu
6a490eab0c Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" into nyc-mr1-dev am: 5913ea0554 am: 5dd794162b am: a48efa4889
am: fc141742c3

Change-Id: Ibfcca4fca723a2c9278303852b4ec97024f77a0d
2017-02-03 18:14:49 +00:00
bohu
e7c76c106d Merge "Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb" into nyc-mr1-dev am: 62ad215942 am: 12bd64c6fe am: 01feb9d59e" into nyc-mr2-dev-plus-aosp
am: 66508658d1

Change-Id: I2998029eb837dbf496f7e7f97c56de524f896852
2017-02-03 18:09:49 +00:00
bohu
4059735ff2 Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb" into nyc-mr1-dev am: 62ad215942 am: 12bd64c6fe am: 01feb9d59e
am: 9c22e70bd9

Change-Id: If16e4f4179ba91642a4c1ecef61d5f916c343830
2017-02-03 18:09:44 +00:00
bohu
fe2f5d195a Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4 am: d8667fc889 am: a8d9471bb9" into nyc-mr1-dev-plus-aosp am: ce6fcf4e16" into nyc-mr2-dev-plus-aosp
am: 680ed52d75

Change-Id: Ib78d3372b2f8b99bb9d18fed70021df2b49cb5b9
2017-02-03 18:08:47 +00:00
bohu
17ce5db3b4 Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4 am: d8667fc889 am: a8d9471bb9" into nyc-mr1-dev-plus-aosp am: ce6fcf4e16
am: 43677291ac

Change-Id: I8f6f58dc87f3b2e1f390b329e1a599710f904334
2017-02-03 18:08:42 +00:00
bohu
3354fc9272 Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4 am: d8667fc889 am: a8d9471bb9 am: ebfbb5ebef" into nyc-mr2-dev-plus-aosp
am: 15e1fdc45c

Change-Id: I4187ac74f472a4ddb6a6db487b97c7b2b05c4750
2017-02-03 18:07:47 +00:00
bohu
015d29d3a4 CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4 am: d8667fc889 am: a8d9471bb9 am: ebfbb5ebef
am: 1a5e97ac18

Change-Id: Ifc5069da7cfd1ff02bba1675105d894c8f73af23
2017-02-03 18:07:42 +00:00
bohu
a5fad393c1 Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb am: b2435d99d4 am: 462d211655 am: 6277bfdd4c
am: 716764c177

Change-Id: Ibecab611003177988d33ba7d02ba44fffbc53173
2017-02-03 18:06:43 +00:00
Android Build Merger (Role)
d3f34832ff Merge "Merge "Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb" into nyc-mr1-dev am: 62ad215942 am: 12bd64c6fe" into nyc-mr1-dev-plus-aosp am: 8cb528be24" into nyc-mr2-dev-plus-aosp 2017-02-03 18:01:32 +00:00
Android Build Merger (Role)
b652f8e29c Merge "Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb" into nyc-mr1-dev am: 62ad215942 am: 12bd64c6fe am: 438edd0637" into nyc-mr2-dev-plus-aosp 2017-02-03 18:01:19 +00:00
bohu
d12df4a355 Merge "Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb" into nyc-mr1-dev am: 62ad215942 am: 12bd64c6fe" into nyc-mr1-dev-plus-aosp
am: 8cb528be24

Change-Id: I608aa117861ce6100b90032f1f9ba50d53234a00
2017-02-03 18:00:57 +00:00
bohu
01aa7f9669 Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb" into nyc-mr1-dev am: 62ad215942 am: 12bd64c6fe
am: 438edd0637

Change-Id: I624e19ef338c626dde03e552dbd150d52fbb8a6a
2017-02-03 18:00:55 +00:00
bohu
4524983bcf Merge "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" into nyc-mr2-dev-plus-aosp
am: 8741fa86a2

Change-Id: Icac9e6f86705e059dbf2e141df8f9eaca58c550f
2017-02-03 18:00:53 +00:00
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
Android Build Merger (Role)
57399eed91 Merge "Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb am: b2435d99d4 am: 462d211655" into nyc-mr1-dev-plus-aosp am: 1921ef39f7" into nyc-mr2-dev-plus-aosp 2017-02-03 18:00:36 +00:00
Android Build Merger (Role)
669273873e Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb am: b2435d99d4 am: 462d211655 am: 4771c1e74a" into nyc-mr2-dev-plus-aosp 2017-02-03 18:00:23 +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
5abe1fc6b2 Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb am: b2435d99d4 am: 462d211655" into nyc-mr1-dev-plus-aosp
am: 1921ef39f7

Change-Id: I994a7dab9317f5f1c952e29bbae440d74aeb8a2e
2017-02-03 17:59:58 +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
b002d878e1 Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb am: b2435d99d4 am: 462d211655
am: 4771c1e74a

Change-Id: If12a59940db8afbdcba11c8b04756b36997048ad
2017-02-03 17:59:57 +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
Android Build Merger (Role)
8d5c4e3319 Merge "Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" into nyc-mr1-dev am: 5913ea0554 am: 5dd794162b" into nyc-mr1-dev-plus-aosp am: d1b373f42e" into nyc-mr2-dev-plus-aosp 2017-02-03 17:56:50 +00:00
Android Build Merger (Role)
caafc3465e Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" into nyc-mr1-dev am: 5913ea0554 am: 5dd794162b am: a48efa4889" into nyc-mr2-dev-plus-aosp 2017-02-03 17:56:38 +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
8bb6b8d5f7 Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" into nyc-mr1-dev am: 5913ea0554 am: 5dd794162b" into nyc-mr1-dev-plus-aosp
am: d1b373f42e

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

Change-Id: If973d0ddc9bba17d0e23ac44ef4d2de320d1856c
2017-02-03 17:56:13 +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)
66508658d1 Merge "Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb" into nyc-mr1-dev am: 62ad215942 am: 12bd64c6fe am: 01feb9d59e" into nyc-mr2-dev-plus-aosp 2017-02-03 17:54:57 +00:00
Android Build Merger (Role)
680ed52d75 Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4 am: d8667fc889 am: a8d9471bb9" into nyc-mr1-dev-plus-aosp am: ce6fcf4e16" into nyc-mr2-dev-plus-aosp 2017-02-03 17:54:52 +00:00
Android Build Merger (Role)
15e1fdc45c Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4 am: d8667fc889 am: a8d9471bb9 am: ebfbb5ebef" into nyc-mr2-dev-plus-aosp 2017-02-03 17:54:41 +00:00
bohu
9c22e70bd9 Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb" into nyc-mr1-dev am: 62ad215942 am: 12bd64c6fe
am: 01feb9d59e

Change-Id: I62cd0356fe430cc82736eaed467e49b78d80ca75
2017-02-03 17:54:34 +00:00
bohu
43677291ac Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4 am: d8667fc889 am: a8d9471bb9" into nyc-mr1-dev-plus-aosp
am: ce6fcf4e16

Change-Id: Ib4f5f4c95d6862e2d98aa4c1d1908950c0b9fec5
2017-02-03 17:54:12 +00:00
bohu
1a5e97ac18 CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4 am: d8667fc889 am: a8d9471bb9
am: ebfbb5ebef

Change-Id: I0fcf89db20b8590f54c7091e5f6aab13290f1e12
2017-02-03 17:54:09 +00:00
bohu
716764c177 Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb am: b2435d99d4 am: 462d211655
am: 6277bfdd4c

Change-Id: I4d7d0d5e6c5b0e009ff385e8594129854b0a7d4d
2017-02-03 17:54:02 +00:00
Android Build Merger (Role)
8741fa86a2 Merge "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" into nyc-mr2-dev-plus-aosp 2017-02-03 17:52:52 +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