tree c015e2cb8ac1250160cbb68bc48a9fd2b8d3f6ca
parent af8e71d59b0ab5e79f53a608b62b3618e36e6a98
author Andreas Gampe <agampe@google.com> 1458704065 -0700
committer Andreas Gampe <agampe@google.com> 1458927790 -0700

ART: Allow array-ness for unresolved merge types

In case component types aren't resolvable, array types won't be
either. They then may be merged. The merge is still potentially
an array type.

Ensure that merging an unresolved array type with a primitive
array type or a non-array type will be resolved to java.lang.Object.

Added tests.

Bug: 27799205
Change-Id: I9beff75318814dddd842abd64ef9a5d2644d801e