tree 3f58000d210c192d68ca60be5a7f3b4f0aa25dbb
parent c93f062125e64cb1ce1f4b0594d0fa3a42a9e9b8
author Christoffer Quist Adamsen <christofferqa@google.com> 1540278247 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> 1540278247 +0200

Version 1.3.25

Merge: Add test for array-return-type collision
CL: https://r8-review.googlesource.com/c/r8/+/29345

Merge: Handle array type collisions in vertical class merger
CL: https://r8-review.googlesource.com/c/r8/+/29342

Partial merge: Static, horizontal class merging
CL: https://r8-review.googlesource.com/c/r8/+/28780

The commit "Static, horizontal class merging" contains a fix for the vertical class merger. This CL only merges that fix from https://r8-review.googlesource.com/c/r8/+/28780 (in particular, this merge does not include the horizontal class merger).

Bug: 117399364
Change-Id: If382ec986fdae0e44b2d37b6d509385ddd58bc06