| commit | c398c0fc8d30ceb227bb82dad9cae8d5dd2d04dc | [log] [tgz] |
|---|---|---|
| author | Felipe Leme <felipeal@google.com> | Tue Dec 13 00:30:21 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Dec 13 00:30:21 2016 +0000 |
| tree | 58d64088d954ba1b4b3cddba14ad56f810475c7b | |
| parent | 830874dbe7550636faa22eddced082b7a33bf207 [diff] | |
| parent | ff93f927e4ca41b8673b7d85c69a5867f1b8a072 [diff] |
Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4." am: ff93f927e4 -s ours Change-Id: I9cf0ed46073b2cf8af33e61df77aa7c0ec168344