am 96e177c7: am 4deaf893: am 6837f4a4: am e4679750: Merge "Fix Watchdog HeartbeatHandler to run on correct thread"
am 96e177c7: am 4deaf893: am 6837f4a4: am e4679750: Merge "Fix Watchdog HeartbeatHandler to run on correct thread"

* commit '96e177c7ddd0446db0ada7455dea0cac8ef70802':
  Fix Watchdog HeartbeatHandler to run on correct thread

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base