Commit 69f9b538 authored by dcashman's avatar dcashman Committed by Android Git Automerger
Browse files

am ef35aac3: resolved conflicts for merge of 056fff4a to lmp-mr1-dev 

* commit 'ef35aac3':
  Change SELinuxHostTest to new sepolicy-analyze args.
parents 0cc7a53c ef35aac3
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment