tree f094afb0142ab4a81faff62f37be306ca0587c33
parent bacaffa497de1877657f9cb3f59a82e3955f0f75
author Adam Lesinski <adamlesinski@google.com> 1496182558 -0700
committer Adam Lesinski <adamlesinski@google.com> 1496250546 -0700

AAPT2: Allow merging of Style attributes from overlays

Previously style overlays would completely override an existing style.
To be compatible with AAPT, styles now merge with the overlay, allowing
the overlay's attributes and parent to take precedence.

Bug: 38355988
Test: make aapt2_tests
Change-Id: Id25c7240050a43e6a4a177c6e3d51e048d0cceb5