OSDN Git Service

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

Change-Id: I2dc30715a2022eb6903b77643afae6eaa0ce3647


Trivial merge