OSDN Git Service

Merge "AAPT2: Error reporting through JNI." into oc-dev
authorChris Warrington <cmw@google.com>
Fri, 28 Apr 2017 20:44:19 +0000 (20:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 28 Apr 2017 20:44:19 +0000 (20:44 +0000)
am: f49baef4b9

Change-Id: I7dab9ad1acb5cdfedd9f68d15f6a49c63e638aae


Trivial merge