merge in ics-release history after reset to master
diff --git a/include/system/camera.h b/include/system/camera.h
index 81ce4cb..86b62b7 100644
--- a/include/system/camera.h
+++ b/include/system/camera.h
@@ -105,8 +105,8 @@
* This does not affect the order of byte array of
* CAMERA_MSG_PREVIEW_FRAME, CAMERA_MSG_VIDEO_FRAME,
* CAMERA_MSG_POSTVIEW_FRAME, CAMERA_MSG_RAW_IMAGE, or
- * CAMERA_MSG_COMPRESSED_IMAGE. This is not allowed to be set during
- * preview
+ * CAMERA_MSG_COMPRESSED_IMAGE. This is allowed to be set during preview
+ * since API level 14.
*/
CAMERA_CMD_SET_DISPLAY_ORIENTATION = 3,
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 7b151f2..77ccafc 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -416,12 +416,12 @@
service drm /system/bin/drmserver
class main
user drm
- group system inet
+ group system inet drmrpc
service media /system/bin/mediaserver
class main
user media
- group audio camera inet net_bt net_bt_admin net_bw_acct
+ group audio camera inet net_bt net_bt_admin net_bw_acct drmrpc
ioprio rt 4
service bootanim /system/bin/bootanimation