tree 385951cae09b6d2c79435aa9e8a50cbe22f36738
parent 28237a7044269c215e213a82b920b72bb5d15e86
parent 3a6a953ccc09cf70f11000e98d8639fcf934cbc0
author Mark Salyzyn <salyzyn@google.com> 1434379647 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434379647 +0000

am 3a6a953c: am 2ab05fc5: Merge "dumpstate: modify logcat timeout to compensate for storage speed"

* commit '3a6a953ccc09cf70f11000e98d8639fcf934cbc0':
  dumpstate: modify logcat timeout to compensate for storage speed