tree 5b5e2e8958cf5c8fcea0cb316497980ee6841806
parent 5a7cf293dabe9a2d81cbf923c50e470a33220da6
parent 98ff7f01bbb7ca395604d7f0cfdfde75ccee2a6b
author Bertrand Simonnet <bsimonnet@google.com> 1452286451 +0000
committer android-build-merger <android-build-merger@google.com> 1452286451 +0000

Merge "init: Allows shutting down cleanly." am: f9f4ee8b72
am: a8c931b7f5

* commit 'a8c931b7f57c8ce74f520d591e99bb367f91dc81':
  init: Allows shutting down cleanly.