| commit | f93437d683f9e79e8c34bd2e6f79c6c5d8507071 | [log] [tgz] |
|---|---|---|
| author | Felipe Leme <felipeal@google.com> | Tue Dec 13 00:41:15 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Dec 13 00:41:15 2016 +0000 |
| tree | a93c835fbe43d933b923f92b6477c3751722acc9 | |
| parent | 88672d7d29cf3ce210cd6f4d9cf66f8119fec0b0 [diff] | |
| parent | c398c0fc8d30ceb227bb82dad9cae8d5dd2d04dc [diff] |
Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4." am: ff93f927e4 -s ours am: c398c0fc8d -s ours Change-Id: I44dd708ba7b890cc54f27cdcee7334c25a215411