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

Change-Id: If064f2f4950fc1a4ff38e6927fe2120af76b26f1

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

..

libcameraservice

resolved conflicts for merge of 27eecb70 to gingerbread

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

tests/CameraServiceTest

move native services under services/

2010-07-14 17:59:35 -07:00