Bjoern Johansson
6a0c8bc950
Merge "resolve merge conflicts of b0dcfcc14c to nyc-mr1-dev" into nyc-mr1-dev am: a888e825f7 am: 11076c3eba
...
am: 5717d105fb
Change-Id: Ibb393dbff3b7c1534958312c4bcd31ddb155dbde
2017-02-16 23:28:30 +00:00
Bjoern Johansson
11076c3eba
Merge "resolve merge conflicts of b0dcfcc14c to nyc-mr1-dev" into nyc-mr1-dev
...
am: a888e825f7
Change-Id: Ia63071dbcdd927781f9412123d065309edccb733
2017-02-16 23:11:03 +00:00
Bjoern Johansson
65085b1fcd
resolve merge conflicts of b0dcfcc14c to nyc-mr1-dev
...
Change-Id: Ic1e35bab2f426fabf4b15b1e60b186124778c9a8
2017-02-14 18:46:59 -08:00
Tina Zhou
b0dcfcc14c
Merge "Merge "Don't require WiFi in CtsHostsideNetworkTests" into nougat-cts-dev am: dfc0ec200f" into nyc-dev
...
am: 2be6d78c13
Change-Id: I578972101d3b4c46132fc360be18a5dd947a4113
2017-02-15 00:57:59 +00:00
Tina Zhou
6ec77dd104
Merge "Don't require WiFi in CtsHostsideNetworkTests" into nougat-cts-dev
...
am: dfc0ec200f
2017-02-15 00:54:56 +00:00
Tina Zhou
dfc0ec200f
Merge "Don't require WiFi in CtsHostsideNetworkTests" into nougat-cts-dev
2017-02-15 00:48:44 +00:00
Paul Duffin
e098c1804d
Prepare for removal of legacy-test from default targets
...
In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.
Bug: 30188076
Test: make checkbuild
Change-Id: I2bbe603b1344d3eef4b48c498311f91b756b85e3
Merged-In: I0f34fe97154240e8f8eef6816df1c794da60351e
2017-02-10 10:35:05 +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
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
2017-02-03 18:00:55 +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
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
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
2017-02-03 17:59:57 +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
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
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
2017-02-03 17:56:13 +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
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
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
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
2017-02-03 17:52:13 +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
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
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
Android Build Merger (Role)
8cb528be24
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
2017-02-03 17:48:43 +00:00
bohu
438edd0637
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
2017-02-03 17:48:23 +00:00
Android Build Merger (Role)
1921ef39f7
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
2017-02-03 17:48:10 +00:00
bohu
4771c1e74a
Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb am: b2435d99d4
...
am: 462d211655
2017-02-03 17:47:49 +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
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
2017-02-03 17:47:05 +00:00
Android Build Merger (Role)
d1b373f42e
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
2017-02-03 17:46:26 +00:00
bohu
a48efa4889
Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" into nyc-mr1-dev am: 5913ea0554
...
am: 5dd794162b
2017-02-03 17:46:05 +00:00
Android Build Merger (Role)
ce6fcf4e16
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
2017-02-03 17:45:54 +00:00
bohu
ebfbb5ebef
CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4 am: d8667fc889
...
am: a8d9471bb9
2017-02-03 17:45:32 +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
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
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
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
2017-02-03 17:43:14 +00:00
