| commit | 32e8f524c4a4ebf7ae725f251b0bc5802c73a3e0 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Thu Jul 09 03:34:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 09 03:34:23 2015 +0000 |
| tree | 0f5f4740c2f986628039d761a9ae1077bc9ae932 | |
| parent | 14b87526211693a39f3adf2b3d47a31058791523 [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