| commit | 525322ecbab1502586d378e7065edc402abc63bf | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Thu Oct 24 13:55:09 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 24 13:55:09 2013 -0700 |
| tree | bfd34a7a31e75614e08fba363f189dba87ddb1ec | |
| parent | 1ba907867d299cb76317c510a2802189f51ce5f6 [diff] | |
| parent | f9f740dae19a63deb92c6bbe5ebeab8c852910a7 [diff] |
am f9f740da: Merge "Support different watchdog timeouts for different entities" into klp-dev * commit 'f9f740dae19a63deb92c6bbe5ebeab8c852910a7': Support different watchdog timeouts for different entities