Commit 15717a32 authored Apr 15, 2013 by Dianne Hackborn Committed by Android Git Automerger Apr 15, 2013

am 0985ac04: Merge "Maybe fix issue #8620910: Win_sdk build failed and unable...

am 0985ac04: Merge "Maybe fix issue #8620910: Win_sdk build failed and unable to create..." into jb-mr2-dev

* commit '0985ac04':
  Maybe fix issue #8620910: Win_sdk build failed and unable to create...

parents f5cfab41 0985ac04

libs/androidfw/AssetManager.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -33,7 +33,9 @@
		#include <utils/threads.h>
		#include <utils/Timers.h>
		#include <utils/ZipFileRO.h>
		#ifdef HAVE_ANDROID_OS
		#include <cutils/trace.h>
		#endif

		#include <assert.h>
		#include <dirent.h>