| commit | 6c61e087e45def71a866caa4094f7adaa3c58277 | [log] [tgz] |
|---|---|---|
| author | Keun-young Park <keunyoung@google.com> | Wed Apr 26 22:49:02 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Apr 26 22:49:02 2017 +0000 |
| tree | f3cb7ecde991570c483ee79f2f937d874cdafccd | |
| parent | 2a53c3ed611f6f57b54b371247e0fd25709a31bf [diff] | |
| parent | 09c780db3a7ef9abd569b14273a682f9271c006a [diff] |
Merge "set default shutdown timeout to 6 secs" am: 47d15ed5b9 am: 0020d4c076 am: 09c780db3a Change-Id: I38ec920f5034b2adc9ab8354144cae1fe554d753