| commit | 310f8da0c3122ed5419db8f12a6e98d3188325b2 | [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 | 0f3435d35e7fe8fca8dc2b347ff46276a8c351c8 | |
| parent | 20f68782a4ea71c6a977d7f87d8288d3daa265ec [diff] [blame] | |
| parent | bdbf6b094d61f694f162a5a5279caededcb1f0a5 [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"