am 04be8136: am 30baa479: (-s ours) Merge "update bundled rc files to their contents from rootdir/init.rc" into mnc-dev-plus-aosp

* commit '04be81366eb441af36017a77b28e4ab65114e88d':
  update bundled rc files to their contents from rootdir/init.rc
This commit is contained in:
Elliott Hughes 2015-08-27 14:37:23 +00:00 committed by Android Git Automerger
commit c8765e6e75

Diff content is not available