Commit cdfb7997 authored by Nick Kralevich's avatar Nick Kralevich Committed by Android Git Automerger
Browse files

am 6f7447f3: (-s ours) resolved conflicts for merge of f766ea77 to klp-modular-dev-plus-aosp 

* commit '6f7447f3':
  Cleanup vroot test and fix false positive.
parents 6d3a8963 6f7447f3
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