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

..

src/com/android/cts/net/hostside

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

Android.mk

Add a test for closing sockets when a VPN comes up.

2016-05-16 23:10:44 +09:00

AndroidManifest.xml

Added test for whitelisting pending intent for Doze Mode.

2016-05-27 14:21:36 -07:00