Commit 93d84970 authored Aug 11, 2017 by Steven Moreland Committed by android-build-merger Aug 11, 2017

Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master

am: 3f378940

Change-Id: Iecb2b1b6ba647b0fe65c538f0a1cdb957e6dbb3e

core/jni/android_hardware_display_DisplayViewport.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@
		#include <android_runtime/Log.h>
		#include <utils/Log.h>

		#include <ScopedUtfChars.h>
		#include <nativehelper/ScopedUtfChars.h>

		namespace android {