tree 3b4d2097aa93632bf01abdf42685db56556800e1
parent 16188d903bc5bc4d44386275b2244d6b507c9e54
parent 218a51b478421568865aff2fd3eb31d1e9607586
author Alan Viverette <alanv@google.com> 1493741064 +0000
committer android-build-merger <android-build-merger@google.com> 1493741064 +0000

Merge "Use AAPT2" into oc-dev am: e7456613dc
am: 218a51b478

Change-Id: Ie084f6ec76814bf16326f49d58c10f629f72af6b