OSDN Git Service

Merge "Update ConnOnActivityStartTest to be hermetic." into oc-mr1-dev am: 06668b5f73
authorSudheer Shanka <sudheersai@google.com>
Fri, 11 Aug 2017 03:22:38 +0000 (03:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Aug 2017 03:22:38 +0000 (03:22 +0000)
commit8518991995204f1ab64a6f86a5f4e5a2eb57bbea
treec0ddb4717b80c56377905a925872b137907a6e82
parentd09b7199e391a70e00e26ea981780811a0c98b9b
parentd732136ed1994120e513238da9dc8f77da5e35cc
Merge "Update ConnOnActivityStartTest to be hermetic." into oc-mr1-dev am: 06668b5f73
am: d732136ed1

Change-Id: Iff9111b3d1e3af576de8327e7fe0fdddf7bcadb1
services/core/java/com/android/server/net/NetworkPolicyManagerService.java