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)
am: a09a333fd2

Change-Id: I5e96976c24d6ec51db9f6952d4b4ba6a9f8724c7


Trivial merge