tree a4f992da3b6027150163260aedf952d634afc7d3
parent 999da7464aaff25e819498a86819407084acad7c
parent fe0fcf5cad75c6ba717a3d0a4ddb7c6bc656135d
author Tom Cherry <tomcherry@google.com> 1440181927 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440181927 +0000

am fe0fcf5c: am b9ac485a: am 49948146: Merge "bundle init.rc contents with its service"

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