| commit | 9f6c3d6036a7c8043217f112c2f1bb9eaebc9b11 | [log] [tgz] |
|---|---|---|
| author | Nicolas Catania <niko@google.com> | Fri Oct 09 15:52:13 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 09 15:52:13 2009 -0700 |
| tree | 5d4d2532fbe00cb209108cb1f94568ebeb5111c1 | |
| parent | aae5b1d11e98c705084b28da604735387ae1eb8d [diff] | |
| parent | 46c9658f4f29cf06e8d84cafdfcda3eba7f37741 [diff] |
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/system/core into eclair-mr2-plus-aosp
diff --git a/rootdir/init.rc b/rootdir/init.rc index e07e106..e777970 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc
@@ -276,6 +276,7 @@ socket zygote stream 666 onrestart write /sys/android_power/request_state wake onrestart write /sys/power/state on + onrestart restart media service media /system/bin/mediaserver user media