commit | c8765e6e75fa733cd7413b7469a32f830f1b8fe7 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:37:23 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:37:23 2015 +0000 |
tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
parent | d1a0bf303c0bacd1ff0fbf324dbe281c9cd6cdce [diff] | |
parent | 04be81366eb441af36017a77b28e4ab65114e88d [diff] |
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