OSDN Git Service

Merge "ART: Allow array-ness for unresolved merge types"
authorAndreas Gampe <agampe@google.com>
Fri, 25 Mar 2016 18:47:52 +0000 (18:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 25 Mar 2016 18:47:52 +0000 (18:47 +0000)
commit290038734d721c8dab27530f2125890de3b2874b
tree70977b25904757c1f77e82160eed1a207fb7eb9b
parent41a7ba0e7183fc37a59a19a317f2b3535e0ee34a
parent0a4d6b9faaaa2652c42679df2a72c78485ed9c64
Merge "ART: Allow array-ness for unresolved merge types"
am: 0a4d6b9

* commit '0a4d6b9faaaa2652c42679df2a72c78485ed9c64':
  ART: Allow array-ness for unresolved merge types