| commit | f42c86660d15c50ff7431b89342e590bcc1bed37 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Wed May 31 20:48:00 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed May 31 20:48:06 2017 +0000 |
| tree | ba24281263894153ec1d89b53e9ead0b0687b603 | |
| parent | d8d9758363524f454cfa1b39a460e461005c84a3 [diff] | |
| parent | 5924d8c9ab7bd8614e8bd99864903ce9d50f3bf7 [diff] |
Merge "AAPT2: Allow merging of Style attributes from overlays" into oc-dev