tree 65a288d43e36c6ea7b113c87f3400345f12b0953
parent cbd0ae37758d6892866484a50e1a019b834da057
parent cdecfcbb33fc3cc85ac7210ec53f6f1f90a6ffee
author JP Abgrall <jpa@google.com> 1391209640 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391209640 +0000

am cdecfcbb: Merge "init: prevent waiting forever when a setprop is incomplete." into klp-volantis-dev

* commit 'cdecfcbb33fc3cc85ac7210ec53f6f1f90a6ffee':
  init: prevent waiting forever when a setprop is incomplete.