tree 328ffbac3044bba529e439511d6ddd0bd82737a9
parent 87797c056c98eb527c85ccb7b7da33c99093e1bc
parent b81ce34af33ce940846e71878279f9482037cb39
author Pavel Zhamaitsiak <pavelz@google.com> 1417808693 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417808693 +0000

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

* commit 'b81ce34af33ce940846e71878279f9482037cb39':
  Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"