OSDN Git Service

resolve merge conflicts of 943187668c44 to oc-dev-plus-aosp
authorRobin Lee <rgl@google.com>
Thu, 30 Mar 2017 16:39:56 +0000 (17:39 +0100)
committerRobin Lee <rgl@google.com>
Thu, 30 Mar 2017 16:39:56 +0000 (17:39 +0100)
commit913554a06818f44dc5fd0fb77673f8fd0e2d32d2
treec0a036a08e73e12d6032971679702ba1b6da9d0a
parent8637cbeac59ea76e3009760d7bf24eaa61d64b13
parent943187668c44db813e0b812468f124352dc0982d
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
services/core/java/com/android/server/ConnectivityService.java
services/core/java/com/android/server/connectivity/Vpn.java