| commit | 09c780db3a7ef9abd569b14273a682f9271c006a | [log] [tgz] |
|---|---|---|
| author | Keun-young Park <keunyoung@google.com> | Wed Apr 26 22:47:00 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Apr 26 22:47:00 2017 +0000 |
| tree | c4002d91b41b8aef5b826c39eeb8a11acfdd0ba5 | |
| parent | a15436569f572dc5f9416fd5ed909fd77a67afae [diff] | |
| parent | 0020d4c076c745e864bd49db9e90891bab413102 [diff] |
Merge "set default shutdown timeout to 6 secs" am: 47d15ed5b9 am: 0020d4c076 Change-Id: I1c0b4552ebc5e52475b4bd98e82a837137be7f6b