am 54f32f56: Merge change I5ff64f6f into eclair-mr2

Merge commit '54f32f562b455ddea84ad9b95946a98e6dfb6686' into eclair-mr2-plus-aosp

* commit '54f32f562b455ddea84ad9b95946a98e6dfb6686':
  Add CameraServiceTest.