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
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 deletions
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