tree 3fc963aa79f8297afc0c51a588861c45e0e82b88
parent c97788f0549242abc253147249019bd9051bf991
parent 56d2e8fb7b2ab6e32efea59604eb0cd72745df1b
author Erik Kline <ek@google.com> 1418238410 +0000
committer android-build-merger <android-build-merger@google.com> 1418238410 +0000

am 33cd463b: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev
automerge: 56d2e8f

* commit '56d2e8fb7b2ab6e32efea59604eb0cd72745df1b':
  Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.