commit de97f798a1c24303de35ff44e2f47b590b46a815
author Geremy Condra <gcondra@google.com> Wed Mar 27 16:42:21 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 27 16:42:21 2013 -0700
tree c1e81800455b1ad5a829fed60f730582b93580f4
parent d118394d444107dba4430723d248863ff412c444
parent bed08333d921e97bc60b81c0f183816386709d79

am bed08333: am c0e1bc1c: Merge "Drop /data/system as a policy file location"

* commit 'bed08333d921e97bc60b81c0f183816386709d79':
  Drop /data/system as a policy file location

init/init.c

diff --git a/init/init.c b/init/init.c
index ede2daa..b28b0ab 100755
--- a/init/init.c
+++ b/init/init.c
@@ -746,7 +746,6 @@
 
 static const struct selinux_opt seopts_prop[] = {
         { SELABEL_OPT_PATH, "/data/security/property_contexts" },
-        { SELABEL_OPT_PATH, "/data/system/property_contexts" },
         { SELABEL_OPT_PATH, "/property_contexts" },
         { 0, NULL }
 };