tree 32ab78fc988236192dc5a688400293326dde163c
parent 7e02c288f0db7714e917b76d6ec570afb1031479
parent 08d7a208e8c8b6e23d7949d5ce9bc06cb5bea538
author Erik Kline <ek@google.com> 1536224484 -0700
committer android-build-merger <android-build-merger@google.com> 1536224484 -0700

Merge "Tighten up neighbor timers if IpReachabilityMonitor is in use"
am: 08d7a208e8

Change-Id: If9493eeeb9a3ffd00140566a54bd5ce859099a54