| commit | 224a848b0f55b8a39ec8bfd73786ccd409def0a2 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Thu Jul 09 03:02:05 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Jul 09 03:02:05 2015 +0000 |
| tree | 2e03a30bc05882248b4b421295caf02052f47492 | |
| parent | 0e87d1809443d41b431ce3a686b4e074df2d7b8b [diff] | |
| parent | 38536287f61c9c0fc3bab8c1950cf8c74881482a [diff] |
Merge "ART: Allow to set and copy conflicts in the verifier"