tree 8cade762d952bcb3cabd217449d30ede5787218f
parent 56cc45f112c1bb21784e1763a4bf748351063f5a
parent 8246d45e94bfb0ce878f41a01602b7b8d78c40ad
author Tom Cherry <tomcherry@google.com> 1440181220 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440181220 +0000

am 8246d45e: Merge "bundle init.rc contents with its service"

* commit '8246d45e94bfb0ce878f41a01602b7b8d78c40ad':
  bundle init.rc contents with its service