tree 31330ced2d8e716c6f151027bef80e93d3061633
parent ea55399ecc761ce4983fc5a6bbbc33ff03f40723
parent c1987487a2c53f2b0b9e595682c1e683e9f7bf8d
author Erik Kline <ek@google.com> 1485244848 +0000
committer android-build-merger <android-build-merger@google.com> 1485244848 +0000

Merge "All upstream mobile connection management is now in UpstreamNetworkMonitor"
am: c1987487a2

Change-Id: I2b7e0f63c8198c8fde52396f989c16d795e612a8