Jean-Baptiste Queru 154a320069 resolved conflicts for merge of 27eecb70 to gingerbread ...

Change-Id: If064f2f4950fc1a4ff38e6927fe2120af76b26f1

2010-07-30 12:08:31 -07:00

..

Camera.h

…

CameraHardwareInterface.h

…

CameraParameters.h

…

ICamera.h

…

ICameraClient.h

…

ICameraService.h

…