am 844079e0: resolved conflicts for merge of b8b53534 to mnc-dr-dev-plus-aosp

* commit '844079e0f28420fa463ac8913332c4e8a5101f34':
  move init.trace.rc to frameworks/native
This commit is contained in:
Tom Cherry 2015-09-03 22:31:49 +00:00 committed by Android Git Automerger
commit 341bb905e2

View file

@ -90,6 +90,5 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
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