tree a32edea0e7539f8575f4b141a45cd4114f2ba59b
parent b1fff84f676d44af8277d68f8122f220538db345
parent 32592270d40d6060e19aa97949aee72c8aca0807
author Tom Cherry <tomcherry@google.com> 1440181225 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440181225 +0000

am 32592270: am 64e13880: Merge "bundle init.rc contents with its service"

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