tree 81e904ced86ff0d345781382171a55eb7a73bce6
parent e0db82163cc7bef240b19e2342e225d858ea8147
parent ceac65ebc86af092e48697be48aaccb826d0ce45
author Irfan Sheriff <isheriff@google.com> 1316816456 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316816456 -0700

am c21994bc: Merge "Fix watchdog to stop ping after wifi disconnects" into ics-factoryrom

* commit 'c21994bc26df959d1a7161e38b4402b7255ea321':
  Fix watchdog to stop ping after wifi disconnects