Bjoern Johansson e711648651 Merge "resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev" into nougat-mr1-cts-dev ...

am: 4acb742c40

Change-Id: I06e42332244bdec51588491d73a0f78950e546a8

2017-02-21 19:12:57 +00:00

..

src/com/android/cts/net/hostside

Merge "resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev" into nougat-mr1-cts-dev

2017-02-21 19:12:57 +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