OSDN Git Service

am 536a38fe: (-s ours) update bundled rc files to their contents from rootdir/init.rc
authorTom Cherry <tomcherry@google.com>
Thu, 27 Aug 2015 12:07:50 +0000 (12:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 12:07:50 +0000 (12:07 +0000)
* commit '536a38fe3317047e9b51813a04ae3a74c3df5d60':
  update bundled rc files to their contents from rootdir/init.rc


Trivial merge