am 82e9d207: Merge "Fix CameraTest#testAccessParameters Assertion" into froyo

Merge commit '82e9d20712d96f03c3ff823a101f51d1b9d54d18' into gingerbread

* commit '82e9d20712d96f03c3ff823a101f51d1b9d54d18':
  Fix CameraTest#testAccessParameters Assertion