tree e989a5992cf01b0ac6fe7c509dbcc8a0ca74f962
parent 8e8d274ed09a2a89b9b0b96c8040af34138bc1df
parent b1894abbc598cc88e275437bdd0ba577d64217eb
author Hugo Benichi <hugobenichi@google.com> 1500452112 +0000
committer android-build-merger <android-build-merger@google.com> 1500452112 +0000

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

Change-Id: I458a0fdae874039e0f1d5cd38ed8ad0a1754bba9