| commit | b5cdbdfcf889606bcc465e48277d6ff7f4c514c8 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Wed May 31 21:12:58 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 31 21:12:58 2017 +0000 |
| tree | 2d12f8979c0a0d906e5242365f2d34f392a6c60e | |
| parent | 4e26aa36223afc649c599ce33ab52a4e61587a62 [diff] | |
| parent | f42c86660d15c50ff7431b89342e590bcc1bed37 [diff] |
Merge "AAPT2: Allow merging of Style attributes from overlays" into oc-dev am: f42c86660d Change-Id: I4a52a16fff3d544d8d7d63d8a482ba7e2111d01a