| commit | 5c3464c75fc517c0306a4ffd39c59671ccfde544 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Wed Aug 24 16:03:48 2016 -0700 |
| committer | Adam Lesinski <adamlesinski@google.com> | Fri Aug 26 19:40:50 2016 -0700 |
| tree | 6a20580de33238d2c16a761f880a442eb5c74c0b | |
| parent | e637f31581787efc533b2115ca7d71fa8d92e98b [diff] |
AAPT2: Fix merging of styleables the right way Styleables should only be merged when processing overlays. This moves the styleable merging code out of ResourceTable and into TableMerger. Change-Id: I3aae05cf4dd875cd25ac2ac744b61194409b2fee