tree 93ce67935c63ea516093be87414a36dc650a1191
parent 173f073ff8e1046cd5335464bfacc5597e3b1daf
parent 754950497050d20ede4ebd30fd99dfda95721349
author Erik Kline <ek@google.com> 1481103486 +0000
committer android-build-merger <android-build-merger@google.com> 1481103486 +0000

Merge "Handle IpReachabilityMonitor errors better." am: 3af34c8e0a am: 4467b79592
am: 7549504970

Change-Id: Icf0ac5ea30fb0a72038979793ea8c673963a7764