| commit | 947f4f4d384ea26eb2145cc070a3eed42c59534a | [log] [tgz] |
|---|---|---|
| author | Mathias Agopian <mathias@google.com> | Fri May 22 01:27:01 2009 -0700 |
| committer | Mathias Agopian <mathias@google.com> | Fri May 22 02:16:08 2009 -0700 |
| tree | edc5fb1e6e808a2b809720f44b6236ebe93b577b | |
| parent | 6158b1bf0364da1582468a98ec09d004ba99deec [diff] [blame] | |
| parent | 0690519fcde1ccb189081aa79df61436f65686c2 [diff] [blame] |
merge master to master_gl
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"