Commit 58355501 authored by Jeff Hao's avatar Jeff Hao Committed by Android Git Automerger
Browse files

am 1c8eff91: am d60f3eee: Verifier uses exception type instead of conflict if unresolved. 

* commit '1c8eff91':
  Verifier uses exception type instead of conflict if unresolved.
parents 7b5f0cf0 1c8eff91
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