tree 3306ba67dfea6cffdf3bdc9c9467cb3f48dc881f
parent a5b8883b0db9d6e129b88f003b541fafd829c77b
parent 88f10c6ce5a97b1990934148deb8ed6aa6ef7a48
author Dianne Hackborn <hackbod@google.com> 1322691355 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322691355 -0800

am 88f10c6c: Merge "Fix issue #5679504: Device stuck and sudden reboot - Watchdog reset?" into ics-mr1

* commit '88f10c6ce5a97b1990934148deb8ed6aa6ef7a48':
  Fix issue #5679504: Device stuck and sudden reboot - Watchdog reset?