tree 653ec955953ea45d93165fc76bc82f1cbb6264ef
parent ad6bd0438745aeb9a4484448e4392dc23ea3b351
parent 218f48d6c55a7ee5115a7a8fc4248d33ea01811f
author Tom Cherry <tomcherry@google.com> 1440181454 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440181454 +0000

am 218f48d6: Merge "bundle init.rc contents with its service"

* commit '218f48d6c55a7ee5115a7a8fc4248d33ea01811f':
  bundle init.rc contents with its service