Commit 4126f465 authored Aug 12, 2017 by Steven Moreland Committed by android-build-merger Aug 12, 2017

Merge "Revert "aapt2_jni: use proper nativehelper headers"" into...

Merge "Revert "aapt2_jni: use proper nativehelper headers"" into stage-aosp-master am: e59c1b1b am: bc6d35e6
am: 8e22616f

Change-Id: Ie23fe137a0cc6df2be34c1c57bb550631654d61b

parents 32755985 8e22616f

tools/aapt2/jni/aapt2_jni.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@
		#include <vector>

		#include "android-base/logging.h"
		#include "nativehelper/ScopedUtfChars.h"
		#include "ScopedUtfChars.h"

		#include "Diagnostics.h"
		#include "util/Util.h"