| commit | 0a3ef41a31dcc6077ba3839835b2b301416b6caf | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Thu Aug 27 10:42:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 10:42:11 2015 +0000 |
| tree | 715d547d2502de8d04de0ec12233b3183ce62c99 | |
| parent | 062a865ff8e3d163757d3bc724e77cc94563751f [diff] | |
| parent | 9f5e9ec76ab7c0698469ec75785294aa94480f57 [diff] |
am 9f5e9ec7: (-s ours) am b9ac485a: am 49948146: Merge "bundle init.rc contents with its service" * commit '9f5e9ec76ab7c0698469ec75785294aa94480f57':