Skip to content
Snippets Groups Projects
Commit 3ec557c8 authored by Jeff Vander Stoep's avatar Jeff Vander Stoep Committed by android-build-merger
Browse files

resolve merge conflicts of bc0e1136 to nyc-dev-plus-aosp am: 1fcd8095 

am: bd5e74bb

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

Change-Id: I987bc536270fcab5530604bf4d4a0f74f528bc29
parents a12cde1c bd5e74bb
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