| commit | 55bb3a9f758c5c65e01c98e5b4540120a5e972fc | [log] [tgz] |
|---|---|---|
| author | Keun-young Park <keunyoung@google.com> | Thu Apr 27 02:10:16 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 27 02:10:17 2017 +0000 |
| tree | 3c8b0474eba39f0d1e5feed237199a0ce20f1a3c | |
| parent | c43a4ad4bc9c47deed1de7f9266227a6bf20167f [diff] | |
| parent | be7ddb0043744c50ce3308e293124a8623401d57 [diff] |
Merge "set default shutdown timeout to 6 secs" into oc-dev