| commit | bc5f9ad9ff81b47dc78faa6729ce6420498e580a | [log] [tgz] |
|---|---|---|
| author | Felipe Leme <felipeal@google.com> | Tue Dec 13 00:54:22 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Dec 13 00:54:22 2016 +0000 |
| tree | fa589a356f923d575349f6c27f0281a56a06bd24 | |
| parent | 49950e68b2081ffe9eeaff9cec8a40d2cc2265aa [diff] | |
| parent | f93437d683f9e79e8c34bd2e6f79c6c5d8507071 [diff] |
Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4." am: ff93f927e4 -s ours am: c398c0fc8d -s ours am: f93437d683 Change-Id: Ic77fec13bfac6f94b6297920fc304ad50af2ca8b