Robin Lee 366eaa24ea resolve merge conflicts of 943187668c44 to oc-dev-plus-aosp ...

Test: make -j30
Test: runtest -x tests/net/java/com/android/server/ConnectivityServiceTest.java
Test: runtest -x tests/net/java/com/android/server/connectivity/VpnTest.java
Change-Id: Ib87cdb96626cd7625e15bec5e4afab12920405e9

2017-03-30 17:39:56 +01:00

..

CoreTests/android/core

Add support for custom TXT records in NSD

2014-04-14 14:10:36 -07:00

net/java

resolve merge conflicts of 943187668c44 to oc-dev-plus-aosp

2017-03-30 17:39:56 +01:00