tree 0b2f5c6ab3c46ca1c36202c7381b61a73bc5bbd9
parent 62362e1a64e09c6223ad6598601bb0adca28d296
parent 372d668a279934ff3b2ec2f07a76fe2f351789d5
author Colin Cross <ccross@android.com> 1372165180 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1372165180 -0700

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

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