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

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

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