OSDN Git Service

Merge "AAPT2: Allow merging of Style attributes from overlays" into oc-dev am: f42c86660d
authorAdam Lesinski <adamlesinski@google.com>
Wed, 31 May 2017 21:23:46 +0000 (21:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 31 May 2017 21:23:46 +0000 (21:23 +0000)
commiteac0410e5d6df2d6d68af94e9f033cf27a5b6b6d
tree8bb36bfc5bc707e9994cb1724c10791c988af280
parenta1a45998780ab10fc326c0b66255703db1247f47
parentb5cdbdfcf889606bcc465e48277d6ff7f4c514c8
Merge "AAPT2: Allow merging of Style attributes from overlays" into oc-dev am: f42c86660d
am: b5cdbdfcf8

Change-Id: Ifabd2f220f96f9dc4942c2cc65b24da6f2d90b13