| commit | d982d29dc2ee02a8a2db3336e4490de253f4cc62 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@android.com> | Thu Mar 28 05:56:36 2013 -0700 |
| committer | The Android Automerger <android-build@android.com> | Thu Mar 28 05:56:36 2013 -0700 |
| tree | c1e81800455b1ad5a829fed60f730582b93580f4 | |
| parent | de97f798a1c24303de35ff44e2f47b590b46a815 [diff] | |
| parent | 584b3321341a8135e92d847639f9669577857c46 [diff] |
merge in jb-mr2-release history after reset to jb-mr2-dev
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 } };