OSDN Git Service

Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4." am: ff93f92...
authorFelipe Leme <felipeal@google.com>
Tue, 13 Dec 2016 00:41:15 +0000 (00:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Dec 2016 00:41:15 +0000 (00:41 +0000)
commitf93437d683f9e79e8c34bd2e6f79c6c5d8507071
treea93c835fbe43d933b923f92b6477c3751722acc9
parent88672d7d29cf3ce210cd6f4d9cf66f8119fec0b0
parentc398c0fc8d30ceb227bb82dad9cae8d5dd2d04dc
Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4." am: ff93f927e4  -s ours
am: c398c0fc8d  -s ours

Change-Id: I44dd708ba7b890cc54f27cdcee7334c25a215411