commit | 5686e5af1bee81b3c899c86a604801850a534e08 | [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 | 709abf5794d28da23ff9425bf548ca0a40932f75 [diff] | |
parent | 7959bf4b9412b5e28e5c241f5bd2d3c9a9221f45 [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