| commit | 97b5257ff0636e46ae7cc027475463e0251c3826 | [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 | 08c0e29f8f420ff494ac7878ff1139b295490ae3 [diff] | |
| parent | 8aa011b4f713e5abd511c234545d81520e3adc17 [diff] |
Merge "set default shutdown timeout to 6 secs" am: 47d15ed5b9 am: 0020d4c076 am: 09c780db3a Change-Id: I38ec920f5034b2adc9ab8354144cae1fe554d753