tree 0a2ac77e58ce3f4718f9da68dfd949ca7214aa70
parent cd9932a1fee2ef38ee07e5ef7ca2fd31bf7a4708
parent 550de399d762964fdfa3b78977048c863fba9fb1
author Hugo Benichi <hugobenichi@google.com> 1507801948 +0000
committer android-build-merger <android-build-merger@google.com> 1507801948 +0000

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

Change-Id: I44024c6cfe2bcb66f00a39ac9d97182ff62a23d1