am 581e4fbe: am 36001ade: Merge "Reset data stall watch dog after doing recovery"

# By Bin Li
# Via Android Git Automerger (1) and others
* commit '581e4fbefde83b2deaa9f2cb555d6bed8153209e':
  Reset data stall watch dog after doing recovery
tree: 6ef9c59054c2375054c5e14e558926dd237d147a
  1. src/
  2. tests/
  3. tools/
  4. Android.mk
  5. CleanSpec.mk