tree d6f0a691a6643dbdafe1adc8dc6d493c1bdeec83
parent 4f117206a82b4dafd429300d32b9b30a1f20409a
parent c1ca1a8328892be6d3f07959ebc998f395dd2d08
author Tom Cherry <tomcherry@google.com> 1490320583 +0000
committer android-build-merger <android-build-merger@google.com> 1490320583 +0000

Merge "init: Prevent spin loop while waiting for exec or property"
am: c1ca1a8328

Change-Id: I591ac447da8d1a6f5db9e2aa48e30c80e0c5e631