| commit | 663a9fcf243477ce93c5a5407f16e74018aabb10 | [log] [tgz] |
|---|---|---|
| author | Felipe Leme <felipeal@google.com> | Tue Dec 13 01:09:15 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Dec 13 01:09:15 2016 +0000 |
| tree | ede609fa106c196993d056cdaf39541e8efe17df | |
| parent | 31c5c4cfc8e2bc3e578e69aa76e7e9c0236d40ba [diff] | |
| parent | bc5f9ad9ff81b47dc78faa6729ce6420498e580a [diff] |
Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4." am: ff93f927e4 -s ours am: c398c0fc8d -s ours am: f93437d683 am: bc5f9ad9ff -s ours Change-Id: I6ccc0774f8d4caa1c91d98bc1860df9180be0849