Skip to content
Snippets Groups Projects
Commit 2d086adc authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

am a2517b20: resolved conflicts for merge of 47cd396b to jb-mr1-dev-plus-aosp 

* commit 'a2517b20':
  Add better per-device sepolicy support.
parents 467f85bb a2517b20
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 48 additions and 15 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment