| commit | 11f9b5815eafab62781420624a435b0e9a71aa6b | [log] [tgz] |
|---|---|---|
| author | Keun-young Park <keunyoung@google.com> | Wed Apr 26 22:43:29 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Apr 26 22:43:29 2017 +0000 |
| tree | 96e0adc581471c5282d56f29f12d04525250bd61 | |
| parent | 8d1f9ff03ea4ccd0ed33a77ec057f6ecb708fe69 [diff] | |
| parent | e22b1df5adaf84d0ead8878f8a31089ad93181af [diff] |
Merge "set default shutdown timeout to 6 secs" am: 47d15ed5b9 Change-Id: I076911247627894009490047caa9f04b8e616755