Merge "emulator: not start adbd upon ro.kernel.qemu=1" am: 7c271bdc3b am: 466b098b87
am: 83255e337a

Change-Id: I26732caa7cc8346e27ec4c8e4816b5cace2577cd
diff --git a/rootdir/init.usb.rc b/rootdir/init.usb.rc
index 3168f40..f0681d2 100644
--- a/rootdir/init.usb.rc
+++ b/rootdir/init.usb.rc
@@ -18,10 +18,6 @@
     disabled
     seclabel u:r:adbd:s0
 
-# adbd on at boot in emulator
-on property:ro.kernel.qemu=1
-    start adbd
-
 on boot
     setprop sys.usb.configfs 0