| commit | 1c8eff91bcef1b14097f9fba6f9c861f8a8ab186 | [log] [tgz] |
|---|---|---|
| author | Jeff Hao <jeffhao@google.com> | Mon Nov 04 21:55:13 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 04 21:55:13 2013 -0800 |
| tree | df73207b3fd6528aa1f2700dc70b083b68a38726 | |
| parent | ebaa337a3be81e9204ee723e519f36125b82e1f3 [diff] | |
| parent | d60f3eee1866d950c0f0bfa6466955538ae81feb [diff] |
am d60f3eee: Verifier uses exception type instead of conflict if unresolved. * commit 'd60f3eee1866d950c0f0bfa6466955538ae81feb': Verifier uses exception type instead of conflict if unresolved.