diff options
| author | Mathias Agopian <mathias@google.com> | 2009-05-22 01:27:01 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-05-22 02:16:08 -0700 |
| commit | 310f8da0c3122ed5419db8f12a6e98d3188325b2 (patch) | |
| tree | 0f3435d35e7fe8fca8dc2b347ff46276a8c351c8 /include/ui/CameraHardwareInterface.h | |
| parent | 20f68782a4ea71c6a977d7f87d8288d3daa265ec (diff) | |
| parent | bdbf6b094d61f694f162a5a5279caededcb1f0a5 (diff) | |
| download | frameworks_native-310f8da0c3122ed5419db8f12a6e98d3188325b2.zip frameworks_native-310f8da0c3122ed5419db8f12a6e98d3188325b2.tar.gz frameworks_native-310f8da0c3122ed5419db8f12a6e98d3188325b2.tar.bz2 | |
merge master to master_gl
Diffstat (limited to 'include/ui/CameraHardwareInterface.h')
| -rw-r--r-- | include/ui/CameraHardwareInterface.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/ui/CameraHardwareInterface.h b/include/ui/CameraHardwareInterface.h index 73036f0..2cdcc06 100644 --- a/include/ui/CameraHardwareInterface.h +++ b/include/ui/CameraHardwareInterface.h @@ -17,7 +17,7 @@ #ifndef ANDROID_HARDWARE_CAMERA_HARDWARE_INTERFACE_H #define ANDROID_HARDWARE_CAMERA_HARDWARE_INTERFACE_H -#include <utils/IMemory.h> +#include <binder/IMemory.h> #include <utils/RefBase.h> #include <ui/CameraParameters.h> #include <ui/Overlay.h> |