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

..

aidl

Fix to CtsHostsideNetworkTestsAidl Java library kind.

2016-09-08 10:51:30 +01:00

app

Merge "resolve merge conflicts of b0dcfcc14c to nyc-mr1-dev" into nyc-mr1-dev am: a888e825f7 am: 11076c3eba

2017-02-16 23:28:30 +00:00

app2

Test to ensure a toast doesn't affect app standby

2016-09-21 12:46:52 -07:00

src/com/android/cts/net

resolve merge conflicts of b0dcfcc14c to nyc-mr1-dev

2017-02-14 18:46:59 -08:00

Android.mk

Switch to CTSv2

2016-02-29 21:51:59 -08:00

AndroidTest.xml

[CTS] - Set test runtimes

2016-03-19 00:10:02 +00:00