diff options
| author | Tom Cherry <tomcherry@google.com> | 2015-09-03 15:33:17 -0700 |
|---|---|---|
| committer | Tom Cherry <tomcherry@google.com> | 2015-09-03 15:33:17 -0700 |
| commit | 3d69581bb002b294916ad98b3b415629a08d8fc8 (patch) | |
| tree | eb2b66150204289ce319d509d62555e835452c56 | |
| parent | 3f7c9ac1972c46ca3ad404f4c0a28e2243b62763 (diff) | |
| parent | 4563938e1a6429d635588a1316e985c3ee4fac50 (diff) | |
| download | qemu-n-iot-preview-2.tar.gz | |
resolved conflicts for merge of 4563938e to mnc-dr-dev-plus-aospandroid-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-preview-1android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2
Change-Id: I4f001f697a3fe312a535ce8f3b78d32881327314
| -rw-r--r-- | qemu_base.mk | 1 |
1 files changed, 0 insertions, 1 deletions
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_PACKAGES += \ 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 \ |