OSDN Git Service

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


Trivial merge