resolve merge conflicts of 91e7ac92 to stage-aosp-master

am: 43c1d482 Change-Id: I97ce8fdc250882bc166839c3c9e3f2311006d3c8

resolve merge conflicts of 91e7ac92 to stage-aosp-master
am: 43c1d482 Change-Id: I97ce8fdc250882bc166839c3c9e3f2311006d3c8
135bf1eb · Mark Salyzyn · android-build-merger · 084c52c8 · 43c1d482 · 135bf1eb
Commit 135bf1eb authored 8 years ago by Mark Salyzyn Committed by android-build-merger 8 years ago
--- a/property_contexts
+++ b/property_contexts
@@ -45,6 +45,7 @@ persist.debug.          u:object_r:persist_debug_prop:s0
 persist.logd.           u:object_r:logd_prop:s0
 persist.logd.security   u:object_r:device_logging_prop:s0
 persist.logd.logpersistd        u:object_r:logpersistd_logging_prop:s0
+logd.logpersistd        u:object_r:logpersistd_logging_prop:s0
 persist.log.tag         u:object_r:log_tag_prop:s0
 persist.mmc.            u:object_r:mmc_prop:s0
 persist.sys.            u:object_r:system_prop:s0