tree fbceea84cc6c6d3235f2dabc795ab5a7f72bb016
parent 6cb234dc57ae24f1dd0cb01217221d946eaed0aa
parent 205a874e860cb33420226e9a345e4fa2c97d14aa
author Tom Cherry <tomcherry@google.com> 1440195641 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440195641 +0000

am 205a874e: update bundled rc files to their contents from rootdir/init.rc

* commit '205a874e860cb33420226e9a345e4fa2c97d14aa':
  update bundled rc files to their contents from rootdir/init.rc