summaryrefslogtreecommitdiffstats
path: root/libs/surfaceflinger/LayerBuffer.h
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
commit310f8da0c3122ed5419db8f12a6e98d3188325b2 (patch)
tree0f3435d35e7fe8fca8dc2b347ff46276a8c351c8 /libs/surfaceflinger/LayerBuffer.h
parent20f68782a4ea71c6a977d7f87d8288d3daa265ec (diff)
parentbdbf6b094d61f694f162a5a5279caededcb1f0a5 (diff)
downloadframeworks_native-310f8da0c3122ed5419db8f12a6e98d3188325b2.zip
frameworks_native-310f8da0c3122ed5419db8f12a6e98d3188325b2.tar.gz
frameworks_native-310f8da0c3122ed5419db8f12a6e98d3188325b2.tar.bz2
merge master to master_gl
Diffstat (limited to 'libs/surfaceflinger/LayerBuffer.h')
-rw-r--r--libs/surfaceflinger/LayerBuffer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/surfaceflinger/LayerBuffer.h b/libs/surfaceflinger/LayerBuffer.h
index 5284409..22af43e 100644
--- a/libs/surfaceflinger/LayerBuffer.h
+++ b/libs/surfaceflinger/LayerBuffer.h
@@ -20,7 +20,7 @@
#include <stdint.h>
#include <sys/types.h>
-#include <utils/IMemory.h>
+#include <binder/IMemory.h>
#include <private/ui/LayerState.h>
#include "LayerBase.h"