replicant-frameworks_native/camera/libcameraservice
Dave Sparks 7118052e31 Merge commit '7b7225c8fdbead25235c74811b30ff4ee690dc58' into manual_merge
Conflicts:
	camera/libcameraservice/CameraService.cpp
2009-05-21 10:17:23 -07:00
..
Android.mk
CameraHardwareStub.cpp
CameraHardwareStub.h
CameraService.cpp Merge commit '7b7225c8fdbead25235c74811b30ff4ee690dc58' into manual_merge 2009-05-21 10:17:23 -07:00
CameraService.h
CannedJpeg.h
FakeCamera.cpp
FakeCamera.h