tree ba24281263894153ec1d89b53e9ead0b0687b603
parent d8d9758363524f454cfa1b39a460e461005c84a3
parent 5924d8c9ab7bd8614e8bd99864903ce9d50f3bf7
author Adam Lesinski <adamlesinski@google.com> 1496263680 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1496263686 +0000

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