Dave Sparks 9f1234e460 resolved conflicts for merge of 04c7d0f8 to master		2009-07-08 17:26:05 -07:00
..
Android.mk	checkpoint: split libutils into libutils + libbinder	2009-05-20 12:55:02 -07:00
CameraHardwareStub.cpp	Automated import from //branches/donutburger/...@141782,141782	2009-03-24 20:53:55 -07:00
CameraHardwareStub.h	move libbinder's header files under includes/binder	2009-05-20 12:55:03 -07:00
CameraService.cpp	resolved conflicts for merge of 04c7d0f8 to master	2009-07-08 17:26:05 -07:00
CameraService.h	Add timestamps to video frames to improve A/V sync.	2009-07-08 15:59:25 -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