| commit | 406318e447eebe928bb94e5eb93fcb18b9dccbdf | [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 | 888e68b2583495614b9688ace0a5c6a3fc579944 [diff] | |
| parent | 6120de8285186ba8f146de860720b1240152b20c [diff] |
Merge "set default shutdown timeout to 6 secs" into oc-dev am: 55bb3a9f75 Change-Id: I3ebe70762d49cd7ed4dc8d042406a5e9587e5f33