tree 7d53144909b2369c5d24965f6641a3c8319fe97b
parent 3eae80461df9306d3e24080ca9f507ea830d9fe0
parent 41b062f673d42bed9e34bf79fceb4bc50533dc76
author Alan Viverette <alanv@google.com> 1493731216 +0000
committer android-build-merger <android-build-merger@google.com> 1493731216 +0000

Merge "Fix opt/chips for AAPT2" into oc-dev
am: 41b062f673

Change-Id: I085750267bebe2198163cc5a3ed0f2ca5de9fbd2