| commit | 3df2c486a238aaf038359b51e726db8dee02ce8a | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Thu Jul 09 03:55:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 09 03:55:30 2015 +0000 |
| tree | 0ae9b2b41b48a351f90686b9f988fccb48a5e9d1 | |
| parent | 48fa2603cbcebc12f48c5b9d06feaa8f060df037 [diff] | |
| parent | c2bf1255ebf360d009dd0763dcea8d2c9b9c676e [diff] |
am c2bf1255: ART: Allow to set and copy conflicts in the verifier * commit 'c2bf1255ebf360d009dd0763dcea8d2c9b9c676e': ART: Allow to set and copy conflicts in the verifier