commit 81ce753ec0014fe404c4eec3ac6d04504356a638
author Nick Kralevich <nnk@google.com> Wed Apr 01 12:09:34 2015 -0700
committer Nick Kralevich <nnk@google.com> Wed Apr 01 12:09:34 2015 -0700
tree a671349000e1d3310bdafc3d153f04b8bfb0b487
parent f4ea3fbf740e864fd2688b4fd3b0c59b9c298b4a
parent 6a9e1f6cdc2a3cdbdb338bb12453d716b8ce42ad

resolved conflicts for merge of 6a9e1f6c to master

Change-Id: I8b985b27c132bf0808fbe4c0e7a095891e45a97a

BoardConfig.mk

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