am e113d6af: am 76a54294: Merge change I155e2ad0 into eclair-mr2

Merge commit 'e113d6af6204dac03b13b324852fe7f741ebb3d3'

* commit 'e113d6af6204dac03b13b324852fe7f741ebb3d3':
  Re-enable CameraSource.