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

am 18fa8e50: (-s ours) resolved conflicts for merge of 2f7c30c2 to klp-modular-dev-plus-aosp 

* commit '18fa8e50':
  Revert "Cleanup vroot test and fix false positive."
parents 3d45000f 18fa8e50
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