Robert Greenwalt 2a7fee4e33 Merge commit '695d2c6df10c99cef25cfca584db9b0e164cdc9f' into manual_merge_695d2c6df10c ...

Change-Id: I768181b347ac5676f3535d94a26ca9e81178a110

2017-04-19 14:03:30 -07:00

..

java

Merge commit 'd6c9efa3323f3f5ae44abe312ae5a1e6ef3816ce' into manual_merge_d6c9efa3323f

2017-04-19 11:24:03 -07:00

jni

Move the connectivity tests to frameworks/base/tests/net.

2017-01-26 18:50:59 +09:00

res/raw

Move some NetworkStats tests to tests/net.

2017-04-13 02:38:11 +09:00

Android.mk

frameworks/base: Add APCT tests to the device-tests suite.

2017-03-15 14:46:27 -07:00

AndroidManifest.xml

Move the connectivity tests to frameworks/base/tests/net.

2017-01-26 18:50:59 +09:00

AndroidTest.xml

Change test type from InstrumentationTest to AndroidJUnitTest

2017-03-31 16:02:33 -07:00