summaryrefslogtreecommitdiffstats
path: root/libs/surfaceflinger/MessageQueue.cpp
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2009-05-22 01:27:01 -0700
committerMathias Agopian <mathias@google.com>2009-05-22 02:16:08 -0700
commit947f4f4d384ea26eb2145cc070a3eed42c59534a (patch)
treeedc5fb1e6e808a2b809720f44b6236ebe93b577b /libs/surfaceflinger/MessageQueue.cpp
parent6158b1bf0364da1582468a98ec09d004ba99deec (diff)
parent0690519fcde1ccb189081aa79df61436f65686c2 (diff)
downloadframeworks_base-947f4f4d384ea26eb2145cc070a3eed42c59534a.zip
frameworks_base-947f4f4d384ea26eb2145cc070a3eed42c59534a.tar.gz
frameworks_base-947f4f4d384ea26eb2145cc070a3eed42c59534a.tar.bz2
merge master to master_gl
Diffstat (limited to 'libs/surfaceflinger/MessageQueue.cpp')
-rw-r--r--libs/surfaceflinger/MessageQueue.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/surfaceflinger/MessageQueue.cpp b/libs/surfaceflinger/MessageQueue.cpp
index 52d4db8..a027e2b 100644
--- 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"