| commit | 5835550104f0ed2296da992783fa5bf6d39a8f36 | [log] [tgz] |
|---|---|---|
| author | Jeff Hao <jeffhao@google.com> | Tue Nov 05 12:02:11 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 05 12:02:11 2013 -0800 |
| tree | 40716727f16bb57ccfbd532cc85bc61f68e1b7a0 | |
| parent | 7b5f0cf08f74ff36760a813888779d28a175982d [diff] | |
| parent | 1c8eff91bcef1b14097f9fba6f9c861f8a8ab186 [diff] |
am 1c8eff91: am d60f3eee: Verifier uses exception type instead of conflict if unresolved. * commit '1c8eff91bcef1b14097f9fba6f9c861f8a8ab186': Verifier uses exception type instead of conflict if unresolved.