OSDN Git Service

Merge "Update ConnOnActivityStartTest to be hermetic." into oc-mr1-dev
authorSudheer Shanka <sudheersai@google.com>
Thu, 10 Aug 2017 23:06:43 +0000 (23:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 10 Aug 2017 23:06:43 +0000 (23:06 +0000)
am: 06668b5f73

Change-Id: I34efad16363ca2b21374967bfabfc8fa2f36ee94

1  2 
services/core/java/com/android/server/NetworkManagementService.java