diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-08-10 01:42:19 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-08-10 01:42:19 -0700 |
| commit | 82583bfef13e4ac6fb2a373992ce451717091552 (patch) | |
| tree | 9c5750b0940de5798405d6be24a35253ca8e6363 | |
| parent | f773f0589761fba76ed4fb77345fb24efbce9828 (diff) | |
| parent | b8d3d0e905b82d3fee42d955968c4f57c1776086 (diff) | |
| download | system_core-82583bfef13e4ac6fb2a373992ce451717091552.tar.gz system_core-82583bfef13e4ac6fb2a373992ce451717091552.tar.bz2 system_core-82583bfef13e4ac6fb2a373992ce451717091552.zip | |
Merge branch 'jb-release' of https://android.googlesource.com/platform/system/core into aosp
Conflicts:
rootdir/init.rc
Change-Id: I62663d9afbce06c44d2ace254e73ee1594632967
| -rw-r--r-- | rootdir/init.rc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc index 05d40885..017f8d24 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -424,7 +424,7 @@ service ril-daemon /system/bin/rild socket rild stream 660 root radio socket rild-debug stream 660 radio system user root - group radio cache inet misc audio sdcard_rw qcom_oncrpc diag + group radio cache inet misc audio sdcard_r sdcard_rw qcom_oncrpc diag log service surfaceflinger /system/bin/surfaceflinger class main |