tree 8ff82881e68db27baa8b60d9f313666eb13fb2e5
parent 1e07ae4dacefd03236d9a5471ad3e2b5ecade1d3
author Erik Kline <ek@google.com> 1417777988 +0900
committer The Android Automerger <android-build@google.com> 1417817481 -0800

Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"

This is the revert of ag/572619.

This reverts commit 9261d9d64548f0221de50eb99f3675488a4176a4, reversing
changes made to 32b61ab28f54e5b00f472b2166f9b1100375e4ff.

Bug: 18609055
Bug: 17769720
Change-Id: I122eba200f2071d4e5777ec34c1d04fb567345a8