commit | c8c57091caa746a8af47f4723aa506a8dda2f121 | [log] [tgz] |
---|---|---|
author | Tom Cherry <tomcherry@google.com> | Fri Oct 05 09:40:37 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Fri Oct 05 09:40:37 2018 -0700 |
tree | 8e9a6b40e4a43f44be3215d441315cd7c9551bd8 | |
parent | 33a86369ed67f1638b7cde21df4edd8830cff9d9 [diff] | |
parent | 1546647c8b7752711275cbbccbe1ccc0a659cf4c [diff] |
Merge "init: allow customizable restart and timeout periods for services" am: 5f2a21d244 am: 63bd73a5cf am: 1546647c8b Change-Id: I8abe4b430bf375e4b347daeb189ca9baa42da241