Commit a750dce3 authored Aug 12, 2017 by Android Build Merger (Role) Committed by Android (Google) Code Review Aug 12, 2017

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

Merge "Merge "aapt2_jni: use proper nativehelper headers" into stage-aosp-master am: e17aa091 am: 1c7ae650 am: 5c655905" into oc-mr1-dev-plus-aosp

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 "ScopedUtfChars.h"
		#include "nativehelper/ScopedUtfChars.h"

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