tree 27efb44c9918ccadd0364e8b024ba1063051c5cb
parent d82cdb4624d436189f1e1c2c53ec0b6ebb792bd9
parent 24a2adfa2738bd531c0172166733a8d8c089fe01
author Hugo Benichi <hugobenichi@google.com> 1500451488 +0000
committer android-build-merger <android-build-merger@google.com> 1500451488 +0000

Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone"
am: 24a2adfa27

Change-Id: I4be1d2ce67871c1e01364beca886fdd3af374321