Hugo Benichi 01432b306d resolve merge conflicts of 9355bce0c323 to master ...

Test: none
Change-Id: Iac65e01d07edf79ec97e7d996f8cfee6f811606b

2017-02-17 10:47:58 +09:00

..

java

resolve merge conflicts of 9355bce0c323 to master

2017-02-17 10:47:58 +09:00

jni

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

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

res/raw

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

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

Android.mk

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

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

AndroidManifest.xml

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

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