OSDN Git Service

Merge "Fix flaky tests in NetworkPolicyManagerServiceTest." into oc-dev
authorSudheer Shanka <sudheersai@google.com>
Thu, 30 Mar 2017 07:43:32 +0000 (07:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 Mar 2017 07:43:32 +0000 (07:43 +0000)
commitabed833af17698f8163bc6c55f4cfff3f9a4dfdb
tree4f0875f608e5eed4bcf79be2282616172d46fe3a
parent949d1353e950ff2f5338a29193c9b52844126cb9
parent8c85b1d0b7a08570f56b572f11d7c079bcf7945d
Merge "Fix flaky tests in NetworkPolicyManagerServiceTest." into oc-dev
am: 8c85b1d0b7

Change-Id: Ic36c9e2220e3d8b3fca408067e0c0cfa1eb99f45