OSDN Git Service

resolve merge conflicts of 6c3cd4449517 to oc-dev-plus-aosp
authorLorenzo Colitti <lorenzo@google.com>
Tue, 28 Mar 2017 14:49:11 +0000 (23:49 +0900)
committerLorenzo Colitti <lorenzo@google.com>
Tue, 28 Mar 2017 14:49:11 +0000 (23:49 +0900)
commit9570e7dae77d05c9a7de1a439e4a32b1e330f958
tree64dd5960a862aa1078a4353819ccffd6ecb88cca
parentf22c3cd18a859f6f4a16b6ef08675afccdcbc850
parent6c3cd444951744980b91855e0303d7b04afb038a
resolve merge conflicts of 6c3cd4449517 to oc-dev-plus-aosp

Test: make -j64 framework services FrameworksNetTests
Change-Id: Ib828e56b271cd983ef325e366418ca8db9774628
services/core/java/com/android/server/ConnectivityService.java
tests/net/java/com/android/server/ConnectivityServiceTest.java