Merge commit '76a5429407e821c22508eca92e7475b6433cd668' into eclair-mr2-plus-aosp * commit '76a5429407e821c22508eca92e7475b6433cd668': Re-enable CameraSource.
Merge commit '76a5429407e821c22508eca92e7475b6433cd668' into eclair-mr2-plus-aosp * commit '76a5429407e821c22508eca92e7475b6433cd668': Re-enable CameraSource.