OSDN Git Service

am ebccaad3: Merge "ART: Add complex UnresolvedMergedType test case"
authorAndreas Gampe <agampe@google.com>
Mon, 10 Aug 2015 18:31:12 +0000 (18:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 10 Aug 2015 18:31:12 +0000 (18:31 +0000)
commitb1a71fa2355f737a1060c8064d0fb5fbc7b17496
treefd682219ee2cec7afc8a2a05a6ae73ad336082df
parentf0cdebde0b0563758ce8bc27b8984a2623e50fd1
parentebccaad3ad6bd32f7a37addc5df2381ce988846e
am ebccaad3: Merge "ART: Add complex UnresolvedMergedType test case"

* commit 'ebccaad3ad6bd32f7a37addc5df2381ce988846e':
  ART: Add complex UnresolvedMergedType test case