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 Automated import from //branches/donutburger/...@141469,141469 2009-03-24 20:21:36 -07:00
CameraHardwareStub.cpp Automated import from //branches/donutburger/...@141782,141782 2009-03-24 20:53:55 -07:00
CameraHardwareStub.h auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
CameraService.cpp Merge commit '7b7225c8fdbead25235c74811b30ff4ee690dc58' into manual_merge 2009-05-21 10:17:23 -07:00
CameraService.h AI 149133: Enable the camera permission check. 2009-05-21 09:18:18 -07:00
CannedJpeg.h auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
FakeCamera.cpp Automated import from //branches/donutburger/...@141782,141782 2009-03-24 20:53:55 -07:00
FakeCamera.h Automated import from //branches/donutburger/...@141992,141992 2009-03-24 21:16:04 -07:00