OSDN Git Service

Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4."
authorFelipe Leme <felipeal@google.com>
Tue, 13 Dec 2016 00:30:21 +0000 (00:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Dec 2016 00:30:21 +0000 (00:30 +0000)
commitc398c0fc8d30ceb227bb82dad9cae8d5dd2d04dc
tree58d64088d954ba1b4b3cddba14ad56f810475c7b
parent830874dbe7550636faa22eddced082b7a33bf207
parentff93f927e4ca41b8673b7d85c69a5867f1b8a072
Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4."
am: ff93f927e4  -s ours

Change-Id: I9cf0ed46073b2cf8af33e61df77aa7c0ec168344