| commit | 9e2294b5622ac3f9a3834472e257856f5211ec2b | [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 | b185e01a884fe587bf395fc1a9d2ecc121f51489 [diff] | |
| parent | 602380aa5fac7a347f81bbcbc15cc3e3e3f8ac5c [diff] |
Merge "set default shutdown timeout to 6 secs" into oc-dev am: 55bb3a9f75 am: 602380aa5f Change-Id: Ie3663d36d9a4ae683e8412cef4458df48584547a