tree f005da706f84464d6009595496d919a19a5e3226
parent e6d2838dcb92a3277c59f4a13c4703b98b837bce
parent 9abb6302e30ed276cf36904bbf09697ccc065a1f
author Tom Cherry <tomcherry@google.com> 1440181464 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440181464 +0000

am 9abb6302: am f7ddd009: Merge "bundle init.rc contents with its service"

* commit '9abb6302e30ed276cf36904bbf09697ccc065a1f':
  bundle init.rc contents with its service