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

am 89aaa5c1: (-s ours) resolved conflicts for merge of dd4775e3 to klp-modular-dev-plus-aosp 

* commit '89aaa5c1':
  Cleanup vroot test and fix false positive.
parents fa03d27e 89aaa5c1
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