tree 6b1095cd55f1f2b293733af4569d01e64f593c82
parent 04b48078e8b267f17f330f0fb29dda0c496c067f
parent f6883504c28f72a4ad79ed43ac40f29c60aaf388
author Hugo Benichi <hugobenichi@google.com> 1500451778 +0000
committer android-build-merger <android-build-merger@google.com> 1500451778 +0000

Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone" am: 24a2adfa27
am: f6883504c2

Change-Id: I432f419d1c8f93136a76cbadfd32018294b3e3d7