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

Merge commit 'faab38e3d90f5c95652c6184e433c909a9743a20' into gingerbread-plus-aosp

* commit 'faab38e3d90f5c95652c6184e433c909a9743a20':
  Fix CameraTest#testAccessParameters Assertion