commit | 602380aa5fac7a347f81bbcbc15cc3e3e3f8ac5c | [log] [tgz] |
---|---|---|
author | Keun-young Park <keunyoung@google.com> | Thu Apr 27 02:14:41 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Apr 27 02:14:41 2017 +0000 |
tree | 98466ba807e49a485f49db1fc3c295ef21c2215c | |
parent | 7eccd838c06d505d46ad71e374c99ce913d21d67 [diff] | |
parent | 55bb3a9f758c5c65e01c98e5b4540120a5e972fc [diff] |
Merge "set default shutdown timeout to 6 secs" into oc-dev am: 55bb3a9f75 Change-Id: I3ebe70762d49cd7ed4dc8d042406a5e9587e5f33