| commit | b28a9652db12b07156d3a4cc1237c45787cd8b72 | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Thu Aug 27 21:18:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:18:30 2015 +0000 |
| tree | 1171e0f448d2a7cc9a592403de376f72ffb73ab1 | |
| parent | cf294ce07ff3c3c1541e67234eb5de75be47fe78 [diff] | |
| parent | bd62797606b0fd083f5a83c3e8089407c6a83c85 [diff] |
am bd627976: am 833c0b83: (-s ours) am aae1bbf4: Merge "bundle init.rc contents with its service" * commit 'bd62797606b0fd083f5a83c3e8089407c6a83c85':