Commit 232fcee5 authored May 05, 2010 by The Android Open Source Project Committed by Android Git Automerger May 05, 2010

am cc42a2d6: am 44bce0fb: merge from open-source master

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