| commit | 6be851571dacbc8dac8348d0d9590bca118bf93b | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Thu Aug 27 14:43:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:43:18 2015 +0000 |
| tree | 778395704d7757ffaee95bb3d85d67bdfae29df7 | |
| parent | 884e540454b4a04e2f280d6a0bf3fae9d90d7e10 [diff] | |
| parent | 2fb660fe7da5bf8c26a93ffbf6c8c9cf328503c4 [diff] |
am 2fb660fe: am 6f230a10: (-s ours) am 45da9118: Merge "bundle init.rc contents with its service" * commit '2fb660fe7da5bf8c26a93ffbf6c8c9cf328503c4':