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

am 58355501: am 1c8eff91: am d60f3eee: Verifier uses exception type instead of... 

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

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