tree 201752b8a06bd98d4265399a2565b50f2c435896
parent 0a33576715ea5fcea7ec24bc5fdb5c6873870787
parent 86cd46f5a991ed847c47efe67443bb68004227ab
author Erik Kline <ek@google.com> 1499070975 +0000
committer android-build-merger <android-build-merger@google.com> 1499070975 +0000

Merge "Switch IpManager and IpReachabilityMonitor to use SharedLog" am: a3ea0e2337 am: 59079c2f8e am: b6b9542479  -s ours
am: 86cd46f5a9  -s ours

Change-Id: I2c0cac316a76a278a522ec18e23e532f913976f9