tree bc2c1fe94a947f68837dfc5a692ff90fad02197f
parent 50e79ad9ce7fbf92d176a557217deb7be40afa84
parent cd573e3aefd391b5c00e2bfa348a46ae08c851ba
author Dan Willemsen <dwillemsen@google.com> 1473741502 +0000
committer android-build-merger <android-build-merger@google.com> 1473741502 +0000

Merge "Remove incremental workaround for aapt overlays" am: 946e58bdff
am: cd573e3aef

Change-Id: I7f90596676af64202fe17f76beb49f0a61a0dc1b