am dea31b41: am 1320687b: Remove logwrapper for Bluetoothd.

Merge commit 'dea31b41331b87bf825e796c6a1bec6a39bfbb04'

* commit 'dea31b41331b87bf825e796c6a1bec6a39bfbb04':
  Remove logwrapper for Bluetoothd.
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 549a009..f9728ee 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -290,14 +290,12 @@
     disabled
     oneshot
 
-#STOPSHIP: Remove logwrapper before production
-service dbus /system/bin/logwrapper /system/bin/dbus-daemon --system --nofork
+service dbus /system/bin/dbus-daemon --system --nofork
     socket dbus stream 660 bluetooth bluetooth
     user bluetooth
     group bluetooth net_bt_admin
 
-#STOPSHIP: Remove logwrapper and -d option before production
-service bluetoothd /system/bin/logwrapper /system/bin/bluetoothd -d -n
+service bluetoothd /system/bin/bluetoothd -n
     socket bluetooth stream 660 bluetooth bluetooth
     socket dbus_bluetooth stream 660 bluetooth bluetooth
     # init.rc does not yet support applying capabilities, so run as root and