tree e17d635ab6ccade4ec16dd41909e98d39194077d
parent 07ea801d40b72134069d588482ba08bba2dfd78f
parent 23364e5ac6c3da00273ec95f24d726b88ba1ccce
author Alan Viverette <alanv@google.com> 1493740447 +0000
committer android-build-merger <android-build-merger@google.com> 1493740447 +0000

Merge "Use AAPT2" into oc-dev am: d3b7539c1c
am: 23364e5ac6

Change-Id: I90e184eeaaf41e6cbd35efbef6b8ba26ae13be1d