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)
commitd732136ed1994120e513238da9dc8f77da5e35cc
tree8b02933dde1c783bb61d23d4967b1c685b224c3d
parent88f3cb403e8254261ce0fb2a18c9e1fba52b5fd5
parent06668b5f739de23487ed0e8258923581d9585d3f
Merge "Update ConnOnActivityStartTest to be hermetic." into oc-mr1-dev
am: 06668b5f73

Change-Id: I34efad16363ca2b21374967bfabfc8fa2f36ee94
services/core/java/com/android/server/NetworkManagementService.java