tree 10299b8684dd65f244b93466404dc8ec425504d0
parent 222f4a2c81d512a53e27fd012d6c549d9deccf81
parent 751e69b38b19398c221e9ef364e21d812763b3e2
author Adam Lesinski <adamlesinski@google.com> 1510308806 +0000
committer android-build-merger <android-build-merger@google.com> 1510308806 +0000

Merge "AAPT2: Workaround for feature splits without namespacing" into oc-mr1-dev
am: 751e69b38b

Change-Id: I8791a0cbfb32c25a0c73552c47509cce1d5f06e2