| commit | 073e62e4ee546d0a44f2262fbf4ca459e3d4fc66 | [log] [tgz] |
|---|---|---|
| author | JP Abgrall <jpa@google.com> | Fri Jan 31 23:07:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 31 23:07:20 2014 +0000 |
| tree | 65a288d43e36c6ea7b113c87f3400345f12b0953 | |
| parent | cbd0ae37758d6892866484a50e1a019b834da057 [diff] | |
| parent | cdecfcbb33fc3cc85ac7210ec53f6f1f90a6ffee [diff] |
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.