Skip to content
Snippets Groups Projects
Commit 14b2fedc authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

resolve merge conflicts of 91e7ac92 to stage-aosp-master am: 43c1d482 

am: 135bf1eb

Change-Id: I5f5ac7ec1ee88221d8e7f7d2d6e918809896d12b
parents 2130972f 135bf1eb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 deletions
property_contexts
+ 1
− 0
View file @ 14b2fedc
...@@ -46,6 +46,7 @@ persist.debug. u:object_r:persist_debug_prop:s0 ...@@ -46,6 +46,7 @@ persist.debug. u:object_r:persist_debug_prop:s0
persist.logd. u:object_r:logd_prop:s0 persist.logd. u:object_r:logd_prop:s0
persist.logd.security u:object_r:device_logging_prop:s0 persist.logd.security u:object_r:device_logging_prop:s0
persist.logd.logpersistd u:object_r:logpersistd_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.log.tag u:object_r:log_tag_prop:s0
persist.mmc. u:object_r:mmc_prop:s0 persist.mmc. u:object_r:mmc_prop:s0
persist.sys. u:object_r:system_prop:s0 persist.sys. u:object_r:system_prop:s0
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment