resolved conflicts for merge of 6a9e1f6c to master
Change-Id: I8b985b27c132bf0808fbe4c0e7a095891e45a97a
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 6e1cb36..042ad72 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -36,23 +36,3 @@
BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy
BOARD_SEPOLICY_DIRS += build/target/board/generic_x86/sepolicy
-
-BOARD_SEPOLICY_UNION += \
- bootanim.te \
- device.te \
- domain.te \
- file.te \
- file_contexts \
- healthd.te \
- installd.te \
- goldfish_setup.te \
- goldfish_logcat.te \
- property.te \
- property_contexts \
- qemu_props.te \
- qemud.te \
- rild.te \
- shell.te \
- surfaceflinger.te \
- system_server.te \
- zygote.te