Commit 0ae6d2e8 authored Aug 25, 2010 by Eric Laurent Committed by Android Git Automerger Aug 25, 2010

am 74ede9e4: am 67b50606: Merge "Fix the simulator build." into gingerbread

Merge commit '74ede9e4'

* commit '74ede9e4':
  Fix the simulator build.

media/libmedia/fixedfft.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -26,7 +26,9 @@

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

		#define LOG_FFT_SIZE 10
		#define MAX_FFT_SIZE (1 << LOG_FFT_SIZE)