OSDN Git Service

Merge "AAPT2: Allow merging of Style attributes from overlays" into oc-dev
authorAdam Lesinski <adamlesinski@google.com>
Wed, 31 May 2017 20:48:00 +0000 (20:48 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 31 May 2017 20:48:06 +0000 (20:48 +0000)
commitf42c86660d15c50ff7431b89342e590bcc1bed37
treeba24281263894153ec1d89b53e9ead0b0687b603
parentd8d9758363524f454cfa1b39a460e461005c84a3
parent5924d8c9ab7bd8614e8bd99864903ce9d50f3bf7
Merge "AAPT2: Allow merging of Style attributes from overlays" into oc-dev
tools/aapt2/link/TableMerger.cpp
tools/aapt2/link/TableMerger_test.cpp