tree 8bb36bfc5bc707e9994cb1724c10791c988af280
parent a1a45998780ab10fc326c0b66255703db1247f47
parent b5cdbdfcf889606bcc465e48277d6ff7f4c514c8
author Adam Lesinski <adamlesinski@google.com> 1496265826 +0000
committer android-build-merger <android-build-merger@google.com> 1496265826 +0000

Merge "AAPT2: Allow merging of Style attributes from overlays" into oc-dev am: f42c86660d
am: b5cdbdfcf8

Change-Id: Ifabd2f220f96f9dc4942c2cc65b24da6f2d90b13