OSDN Git Service

Merge "Include v4, use AAPT2" into oc-dev
authorAlan Viverette <alanv@google.com>
Tue, 2 May 2017 13:15:17 +0000 (13:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 May 2017 13:15:17 +0000 (13:15 +0000)
commite164d753718f94510159ceca578f81b766aa75b1
treea3e03ae28cd33cb1f88f3c44fc10214e1e9827bd
parent14ed9bec5649c12db2d80fb92e96f5806a11a7fa
parenta09a333fd27fb5e2ccc65c65c9cca7e4785d4cce
Merge "Include v4, use AAPT2" into oc-dev
am: a09a333fd2

Change-Id: I5e96976c24d6ec51db9f6952d4b4ba6a9f8724c7