resolved conflicts for merge of e2c7d491 to master
Change-Id: I17cc5534c68d6cc1f35d294af7870b7037843525
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 8611239..b4cbd50 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -38,19 +38,3 @@
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy
-BOARD_SEPOLICY_UNION += \
- bootanim.te \
- device.te \
- domain.te \
- file.te \
- file_contexts \
- goldfish_setup.te \
- goldfish_logcat.te \
- property.te \
- property_contexts \
- qemu_props.te \
- qemud.te \
- rild.te \
- shell.te \
- surfaceflinger.te \
- system_server.te