Commit 8e22616f authored Aug 11, 2017 by Steven Moreland Committed by android-build-merger Aug 11, 2017

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

am: bc6d35e6

Change-Id: Ida9cc1c9c2a64920ce094f2305e2e7bc1abaec1b

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"