tree bc1320d1bad147d15d3512677b01df561ae642e6
parent e5faca1d4ac0de0920d379dca656c0f809045640
parent 45da91185bbfbc01569f682f65c03fc4629aa579
author Tom Cherry <tomcherry@google.com> 1440181226 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440181226 +0000

am 45da9118: Merge "bundle init.rc contents with its service"

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