merge from open-source master

Change-Id: Ic4cfffc3c8d465224b062cef7bcfe5827441057c

libpixelflinger/codeflinger/texturing.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@

		#include "codeflinger/GGLAssembler.h"

		#ifdef __arm__
		#ifdef __ARM_ARCH__
		#include <machine/cpu-features.h>
		#endif