Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4."

am: ff93f927e4  -s ours

Change-Id: I9cf0ed46073b2cf8af33e61df77aa7c0ec168344
This commit is contained in:
Felipe Leme
2016-12-13 00:30:21 +00:00
committed by android-build-merger

Diff Content Not Available