tree 3055d97226f7098f4d2acdd56385335a08a43ad8
parent 72ec78511ae4646ae5b74336e1b19e0bfbe26364
parent 10b02df820ece261b621a1f46838995249a1082c
author Tom Cherry <tomcherry@google.com> 1440181887 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440181887 +0000

am 10b02df8: am 218f48d6: Merge "bundle init.rc contents with its service"

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