Skip to content
Snippets Groups Projects
Commit bd5e74bb authored by Daniel Micay's avatar Daniel Micay Committed by android-build-merger
Browse files

resolve merge conflicts of bc0e1136 to nyc-dev-plus-aosp

am: 1fcd8095

* commit '1fcd8095':
  expose control over unpriv perf access to shell

Change-Id: I96514ce5be1df668e86d745084a2a025adfdae28
parents 2d759f50 1fcd8095
No related branches found
No related tags found
No related merge requests found
......@@ -34,6 +34,7 @@ debug.db. u:object_r:debuggerd_prop:s0
dumpstate. u:object_r:dumpstate_prop:s0
log. u:object_r:log_prop:s0
log.tag.WifiHAL u:object_r:wifi_log_prop:s0
security.perf_harden u:object_r:shell_prop:s0
service.adb.root u:object_r:shell_prop:s0
service.adb.tcp.port u:object_r:shell_prop:s0
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment