commit 3d69581bb002b294916ad98b3b415629a08d8fc8
author Tom Cherry <tomcherry@google.com> Thu Sep 03 15:33:17 2015 -0700
committer Tom Cherry <tomcherry@google.com> Thu Sep 03 15:33:17 2015 -0700
tree eb2b66150204289ce319d509d62555e835452c56
parent 3f7c9ac1972c46ca3ad404f4c0a28e2243b62763
parent 4563938e1a6429d635588a1316e985c3ee4fac50

resolved conflicts for merge of 4563938e to mnc-dr-dev-plus-aosp

Change-Id: I4f001f697a3fe312a535ce8f3b78d32881327314

qemu_base.mk

diff --git a/qemu_base.mk b/qemu_base.mk
index d310e81..3a8925c 100644
--- a/qemu_base.mk
+++ b/qemu_base.mk
@@ -79,7 +79,6 @@
 PRODUCT_COPY_FILES += \
     system/core/rootdir/init.usb.rc:root/init.usb.rc \
     system/core/rootdir/init.usb.configfs.rc:root/init.usb.configfs.rc \
-    system/core/rootdir/init.trace.rc:root/init.trace.rc \
     system/core/rootdir/ueventd.rc:root/ueventd.rc \
     system/core/rootdir/etc/hosts:system/etc/hosts \