Merge "set default shutdown timeout to 6 secs" into oc-dev
am: 55bb3a9f75
Change-Id: I3ebe70762d49cd7ed4dc8d042406a5e9587e5f33
This commit is contained in:
commit
602380aa5f
am: 55bb3a9f75
Change-Id: I3ebe70762d49cd7ed4dc8d042406a5e9587e5f33