tree 0515441ccbdb3c4b50c7c55ea2df5495acfdd4a5
parent e95023f55a5713537f305d4cccb50c1438581ff2
parent 7d9588c83648401337f93ecb16d854155f4d603a
author Hugo Benichi <hugobenichi@google.com> 1507800821 +0000
committer android-build-merger <android-build-merger@google.com> 1507800821 +0000

Merge "Migrate most of core networking tests to junit4" am: 9d456cd9c6
am: 7d9588c836

Change-Id: I3a02bcf20f59c2a07b7c920707cf6cde0bf68478