am dd3cd0c8: am 3ef00282: am 49ecbb75: Merge "enlarge timeout for android.hardware.cts.CameraTest#testPreviewPictureSizesCombination. Some device will support too many counts of preview sizes to finish test in time." into gingerbread

* commit 'dd3cd0c84e0922697c361cf912d930e38b5bde09':
  enlarge timeout for android.hardware.cts.CameraTest#testPreviewPictureSizesCombination. Some device will support too many counts of preview sizes to finish test in time.