merge master to master_gl

2009-05-22 01:27:01 -07:00
parent 6158b1bf03 0690519fcd
commit 947f4f4d38
510 changed files with 27437 additions and 7368 deletions
--- a/libs/surfaceflinger/MessageQueue.cpp
+++ b/libs/surfaceflinger/MessageQueue.cpp
@@ -21,7 +21,7 @@
 #include <utils/threads.h>
 #include <utils/Timers.h>
 #include <utils/Log.h>
-#include <utils/IPCThreadState.h>
+#include <binder/IPCThreadState.h>

 #include "MessageQueue.h"