tree 333e0436a0d6d200e7617694f7451e1c93bb40b8
parent 9270f12529fdcadaacd9d2bce3ceeeb07d037aa8
parent 39021a48a0e0687c654423acd5a4c99a1d79440d
author Colin Cross <ccross@android.com> 1372112863 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1372112863 -0700

am 39021a48: am 83ada447: Merge changes Ib54f39fd,I7e36edd8

* commit '39021a48a0e0687c654423acd5a4c99a1d79440d':
  init: Retain traditional restart behavior for critical and oneshot services.
  init: Safely restart services to avoid race conditions.