| commit | 4c1ec218f2e593ce6d2946a2e19d7c94adf959c7 | [log] [tgz] |
|---|---|---|
| author | Keun-young Park <keunyoung@google.com> | Wed Apr 26 22:55:32 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Apr 26 22:55:32 2017 +0000 |
| tree | 4ef62ef7416fb642e5119f6188d450eb64c89d25 | |
| parent | f5acd1058cfea45c1ad99ce34ab056b4f28a7df2 [diff] | |
| parent | 97b5257ff0636e46ae7cc027475463e0251c3826 [diff] |
Merge "set default shutdown timeout to 6 secs" am: 47d15ed5b9 am: 0020d4c076 am: 09c780db3a am: 6c61e087e4 Change-Id: I5ed4c11b86d3976c383f0b16b4b96ffd141830ef