OSDN Git Service

am 46f5dcbd: am 224a848b: Merge "ART: Allow to set and copy conflicts in the verifier"
authorAndreas Gampe <agampe@google.com>
Thu, 9 Jul 2015 03:41:45 +0000 (03:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 9 Jul 2015 03:41:45 +0000 (03:41 +0000)
commit7df8e213c9b4fc96fd9111ee02f6a29c7261dae7
tree0f5f4740c2f986628039d761a9ae1077bc9ae932
parent32e8f524c4a4ebf7ae725f251b0bc5802c73a3e0
parent46f5dcbd8d4172d5f3acc10e68eaf8e3b7a855b8
am 46f5dcbd: am 224a848b: Merge "ART: Allow to set and copy conflicts in the verifier"

* commit '46f5dcbd8d4172d5f3acc10e68eaf8e3b7a855b8':
  ART: Allow to set and copy conflicts in the verifier