tree dce5149a503e37fea6579db3b5526a093dfd4a9e
parent 77a59a9ae576893149ea0d3eb25a05ea9138e42a
parent 5c65590564c94a5db5ca58994a74cd39754d97eb
author Steven Moreland <smoreland@google.com> 1502508749 +0000
committer android-build-merger <android-build-merger@google.com> 1502508749 +0000

Merge "aapt2_jni: use proper nativehelper headers" into stage-aosp-master am: e17aa09136 am: 1c7ae6507e
am: 5c65590564

Change-Id: Ie3c13f03658a2a5ac8fae7edadb4833b86716386