| commit | f9f740dae19a63deb92c6bbe5ebeab8c852910a7 | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Thu Oct 24 20:52:23 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Oct 24 20:52:23 2013 +0000 |
| tree | 42e3e233e496080be4ef096a3691344e3d8635ef | |
| parent | 28e26eb38d38c5058006f90d5a22347e6186532e [diff] | |
| parent | e6f81cf1f69e0683f969238f921950befba8e6c3 [diff] |
Merge "Support different watchdog timeouts for different entities" into klp-dev