| commit | bae3350395a454772b459a398e6c709e22d8c729 | [log] [tgz] |
|---|---|---|
| author | Jeff Hao <jeffhao@google.com> | Tue Nov 05 12:05:10 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 05 12:05:10 2013 -0800 |
| tree | b96cc0d6d15cc60adf0939252b93bb47cb210448 | |
| parent | 6b98c91275d4361d1b74effad36995cc2d687a55 [diff] | |
| parent | 5835550104f0ed2296da992783fa5bf6d39a8f36 [diff] |
am 58355501: am 1c8eff91: am d60f3eee: Verifier uses exception type instead of conflict if unresolved. * commit '5835550104f0ed2296da992783fa5bf6d39a8f36': Verifier uses exception type instead of conflict if unresolved.