OSDN Git Service

am b1a71fa2: am ebccaad3: Merge "ART: Add complex UnresolvedMergedType test case"
authorAndreas Gampe <agampe@google.com>
Mon, 10 Aug 2015 20:08:04 +0000 (20:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 10 Aug 2015 20:08:04 +0000 (20:08 +0000)
commit8ff751b078a66ec3836f05e34eb72f9209945b78
tree7e790f8add3d2014560f3fde748e9352a98e1707
parent68a82e22e265e103c18d0e334394511c3b417e02
parentb1a71fa2355f737a1060c8064d0fb5fbc7b17496
am b1a71fa2: am ebccaad3: Merge "ART: Add complex UnresolvedMergedType test case"

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