| commit | 39379dccae69d28a17094ab3b611f9bdfe584acc | [log] [tgz] |
|---|---|---|
| author | Keun-young Park <keunyoung@google.com> | Thu Apr 27 02:16:39 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 27 02:16:39 2017 +0000 |
| tree | a75e504a710718784bfe128bf991134787f9366b | |
| parent | 2eee5c57872d9236ba84a45e7466187593b66c51 [diff] | |
| parent | 406318e447eebe928bb94e5eb93fcb18b9dccbdf [diff] |
Merge "set default shutdown timeout to 6 secs" into oc-dev am: 55bb3a9f75 am: 602380aa5f Change-Id: Ie3663d36d9a4ae683e8412cef4458df48584547a