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)
am: 8c85b1d0b7

Change-Id: Ic36c9e2220e3d8b3fca408067e0c0cfa1eb99f45


Trivial merge